Fix logs generated by LSPosed manager

1. Update Dobby to set log TAG properly 2. Fix log preference settings for debug version
JingMatrix · Dec 7, 2024 · 98565cf · 98565cf
1 parent 6eb133b
commit 98565cf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java b/app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java
@@ -156,15 +156,17 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             MaterialSwitchPreference prefVerboseLogs = findPreference("disable_verbose_log");
             if (prefVerboseLogs != null) {
                 prefVerboseLogs.setEnabled(!BuildConfig.DEBUG && installed);
+                if (BuildConfig.DEBUG) ConfigManager.setVerboseLogEnabled(false);
                 prefVerboseLogs.setChecked(!installed || !ConfigManager.isVerboseLogEnabled());
                 prefVerboseLogs.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setVerboseLogEnabled(!(boolean) newValue));
             }
 
-            MaterialSwitchPreference prefEnableLog = findPreference("enable_log_watchdog");
-            if (prefEnableLog != null) {
-                prefEnableLog.setEnabled(!BuildConfig.DEBUG && installed);
-                prefEnableLog.setChecked(!installed || ConfigManager.isLogWatchdogEnabled());
-                prefEnableLog.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setLogWatchdog((boolean) newValue));
+            MaterialSwitchPreference prefLogWatchDog = findPreference("enable_log_watchdog");
+            if (prefLogWatchDog != null) {
+                prefLogWatchDog.setEnabled(!BuildConfig.DEBUG && installed);
+                if (BuildConfig.DEBUG) ConfigManager.setLogWatchdog(true);
+                prefLogWatchDog.setChecked(!installed || ConfigManager.isLogWatchdogEnabled());
+                prefLogWatchDog.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setLogWatchdog((boolean) newValue));
             }
 
             MaterialSwitchPreference prefDexObfuscate = findPreference("enable_dex_obfuscate");

diff --git a/daemon/src/main/jni/logcat.cpp b/daemon/src/main/jni/logcat.cpp
@@ -227,9 +227,10 @@ void Logcat::ProcessBuffer(struct log_msg *buf) {
         modules_print_count_ += PrintLogLine(entry, modules_file_.get());
         shortcut = true;
     }
-    if (verbose_ && (shortcut || buf->id() == log_id::LOG_ID_CRASH || entry.pid == my_pid_ ||
-                     tag == "Magisk"sv || tag == "LSPlt"sv || tag.starts_with("zygisk"sv) ||
-                     tag == "LSPlant"sv || tag.starts_with("LSPosed"sv))) [[unlikely]] {
+    if (verbose_ &&
+        (shortcut || buf->id() == log_id::LOG_ID_CRASH || entry.pid == my_pid_ ||
+         tag == "Dobby"sv || tag == "Magisk"sv || tag == "LSPlant"sv || tag == "LSPlt"sv ||
+         tag.starts_with("LSPosed"sv) || tag.starts_with("zygisk"sv))) [[unlikely]] {
         verbose_print_count_ += PrintLogLine(entry, verbose_file_.get());
     }
     if (entry.pid == my_pid_ && tag == "LSPosedLogcat"sv) [[unlikely]] {

diff --git a/external/dobby b/external/dobby
+6 −4		CMakeLists.txt
+3 −5		external/logging/logging.cc
+16 −92		source/InstructionRelocation/arm/InstructionRelocationARM.cc
+0 −40		source/core/arch/arm/registers-arm.h
+0 −15		source/core/assembler/assembler-arm.h