From eb2ff94104baf3b333b82901a208bf93a17a5cd9 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Fri, 4 Nov 2022 02:40:04 +0000 Subject: [PATCH] android: when running debug apk, disallow changing "enable_debug_logs" follow-up 34b594ea40aac5ab66e1fe06f09df14c28898f6e --- electrum/logging.py | 5 ++--- run_electrum | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/electrum/logging.py b/electrum/logging.py index 50f2fd083..b7cbe23e5 100644 --- a/electrum/logging.py +++ b/electrum/logging.py @@ -314,9 +314,8 @@ def configure_logging(config: 'SimpleConfig', *, log_to_file: Optional[bool] = N verbosity = config.get('verbosity') verbosity_shortcuts = config.get('verbosity_shortcuts') - if not verbosity: - if config.get('gui_enable_debug_logs') or is_android_debug_apk(): - verbosity = '*' + if not verbosity and config.get('gui_enable_debug_logs'): + verbosity = '*' _configure_stderr_logging(verbosity=verbosity, verbosity_shortcuts=verbosity_shortcuts) if log_to_file is None: diff --git a/run_electrum b/run_electrum index 0d04458d4..28b4f62e7 100755 --- a/run_electrum +++ b/run_electrum @@ -325,9 +325,10 @@ def main(): import importlib.util android_gui = 'kivy' if importlib.util.find_spec('kivy') else 'qml' config_options = { + 'verbosity': '*' if util.is_android_debug_apk() else '', 'cmd': 'gui', 'gui': android_gui, - 'single_password':True, + 'single_password': True, } if util.get_android_package_name() == "org.electrum.testnet.electrum": # ~hack for easier testnet builds. pkgname subject to change.