WeiguangTWK
/
LSPosed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix logs generated by LSPosed manager 

1. Update Dobby to set log TAG properly
2. Fix log preference settings for debug version
This commit is contained in:
JingMatrix 2024-12-07 12:56:50 +01:00
parent 6eb133b114
commit 98565cf9b8
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/lsposed/manager/ui/fragment/SettingsFragment.java
View File

@ -156,15 +156,17 @@ public class SettingsFragment extends BaseFragment {
MaterialSwitchPreference prefVerboseLogs = findPreference("disable_verbose_log"); MaterialSwitchPreference prefVerboseLogs = findPreference("disable_verbose_log");
if (prefVerboseLogs != null) { if (prefVerboseLogs != null) {
prefVerboseLogs.setEnabled(!BuildConfig.DEBUG && installed); prefVerboseLogs.setEnabled(!BuildConfig.DEBUG && installed);
if (BuildConfig.DEBUG) ConfigManager.setVerboseLogEnabled(false);
prefVerboseLogs.setChecked(!installed || !ConfigManager.isVerboseLogEnabled()); prefVerboseLogs.setChecked(!installed || !ConfigManager.isVerboseLogEnabled());
prefVerboseLogs.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setVerboseLogEnabled(!(boolean) newValue)); prefVerboseLogs.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setVerboseLogEnabled(!(boolean) newValue));
} }
MaterialSwitchPreference prefEnableLog = findPreference("enable_log_watchdog"); MaterialSwitchPreference prefLogWatchDog = findPreference("enable_log_watchdog");
if (prefEnableLog != null) { if (prefLogWatchDog != null) {
prefEnableLog.setEnabled(!BuildConfig.DEBUG && installed); prefLogWatchDog.setEnabled(!BuildConfig.DEBUG && installed);
prefEnableLog.setChecked(!installed || ConfigManager.isLogWatchdogEnabled()); if (BuildConfig.DEBUG) ConfigManager.setLogWatchdog(true);
prefEnableLog.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setLogWatchdog((boolean) newValue)); prefLogWatchDog.setChecked(!installed || ConfigManager.isLogWatchdogEnabled());
prefLogWatchDog.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setLogWatchdog((boolean) newValue));
} }
MaterialSwitchPreference prefDexObfuscate = findPreference("enable_dex_obfuscate"); MaterialSwitchPreference prefDexObfuscate = findPreference("enable_dex_obfuscate");

7
daemon/src/main/jni/logcat.cpp
View File

@ -227,9 +227,10 @@ void Logcat::ProcessBuffer(struct log_msg *buf) {
modules_print_count_ += PrintLogLine(entry, modules_file_.get()); modules_print_count_ += PrintLogLine(entry, modules_file_.get());
shortcut = true; shortcut = true;
} }
if (verbose_ && (shortcut || buf->id() == log_id::LOG_ID_CRASH || entry.pid == my_pid_ || if (verbose_ &&
tag == "Magisk"sv || tag == "LSPlt"sv || tag.starts_with("zygisk"sv) || (shortcut || buf->id() == log_id::LOG_ID_CRASH || entry.pid == my_pid_ ||
tag == "LSPlant"sv || tag.starts_with("LSPosed"sv))) [[unlikely]] { 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()); verbose_print_count_ += PrintLogLine(entry, verbose_file_.get());
} }
if (entry.pid == my_pid_ && tag == "LSPosedLogcat"sv) [[unlikely]] { if (entry.pid == my_pid_ && tag == "LSPosedLogcat"sv) [[unlikely]] {

2
external/dobby vendored

@ -1 +1 @@
Subproject commit 389938ae5e7f2fbc45fc62f94a20192a29d37435 Subproject commit e430ce2f08ab433093e05b38ee3da7cecb474575