Skip to content

Commit 98565cf

Browse files
committed
Fix logs generated by LSPosed manager
1. Update Dobby to set log TAG properly 2. Fix log preference settings for debug version
1 parent 6eb133b commit 98565cf

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,17 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
156156
MaterialSwitchPreference prefVerboseLogs = findPreference("disable_verbose_log");
157157
if (prefVerboseLogs != null) {
158158
prefVerboseLogs.setEnabled(!BuildConfig.DEBUG && installed);
159+
if (BuildConfig.DEBUG) ConfigManager.setVerboseLogEnabled(false);
159160
prefVerboseLogs.setChecked(!installed || !ConfigManager.isVerboseLogEnabled());
160161
prefVerboseLogs.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setVerboseLogEnabled(!(boolean) newValue));
161162
}
162163

163-
MaterialSwitchPreference prefEnableLog = findPreference("enable_log_watchdog");
164-
if (prefEnableLog != null) {
165-
prefEnableLog.setEnabled(!BuildConfig.DEBUG && installed);
166-
prefEnableLog.setChecked(!installed || ConfigManager.isLogWatchdogEnabled());
167-
prefEnableLog.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setLogWatchdog((boolean) newValue));
164+
MaterialSwitchPreference prefLogWatchDog = findPreference("enable_log_watchdog");
165+
if (prefLogWatchDog != null) {
166+
prefLogWatchDog.setEnabled(!BuildConfig.DEBUG && installed);
167+
if (BuildConfig.DEBUG) ConfigManager.setLogWatchdog(true);
168+
prefLogWatchDog.setChecked(!installed || ConfigManager.isLogWatchdogEnabled());
169+
prefLogWatchDog.setOnPreferenceChangeListener((preference, newValue) -> ConfigManager.setLogWatchdog((boolean) newValue));
168170
}
169171

170172
MaterialSwitchPreference prefDexObfuscate = findPreference("enable_dex_obfuscate");

daemon/src/main/jni/logcat.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,10 @@ void Logcat::ProcessBuffer(struct log_msg *buf) {
227227
modules_print_count_ += PrintLogLine(entry, modules_file_.get());
228228
shortcut = true;
229229
}
230-
if (verbose_ && (shortcut || buf->id() == log_id::LOG_ID_CRASH || entry.pid == my_pid_ ||
231-
tag == "Magisk"sv || tag == "LSPlt"sv || tag.starts_with("zygisk"sv) ||
232-
tag == "LSPlant"sv || tag.starts_with("LSPosed"sv))) [[unlikely]] {
230+
if (verbose_ &&
231+
(shortcut || buf->id() == log_id::LOG_ID_CRASH || entry.pid == my_pid_ ||
232+
tag == "Dobby"sv || tag == "Magisk"sv || tag == "LSPlant"sv || tag == "LSPlt"sv ||
233+
tag.starts_with("LSPosed"sv) || tag.starts_with("zygisk"sv))) [[unlikely]] {
233234
verbose_print_count_ += PrintLogLine(entry, verbose_file_.get());
234235
}
235236
if (entry.pid == my_pid_ && tag == "LSPosedLogcat"sv) [[unlikely]] {

0 commit comments

Comments
 (0)