AaronFiore/electrum
1
0
Fork 0
Code Activity

android: when running debug apk, disallow changing "enable_debug_logs"

Browse Source 
follow-up 34b594ea40
This commit is contained in:
SomberNight
2022-11-04 02:40:04 +00:00
parent 4a3bc2f8b9
commit eb2ff94104
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
electrum/logging.py
View File

@@ -314,9 +314,8 @@ def configure_logging(config: 'SimpleConfig', *, log_to_file: Optional[bool] = N
verbosity = config.get('verbosity') verbosity = config.get('verbosity')
verbosity_shortcuts = config.get('verbosity_shortcuts') verbosity_shortcuts = config.get('verbosity_shortcuts')
if not verbosity: if not verbosity and config.get('gui_enable_debug_logs'):
if config.get('gui_enable_debug_logs') or is_android_debug_apk(): verbosity = '*'
verbosity = '*'
_configure_stderr_logging(verbosity=verbosity, verbosity_shortcuts=verbosity_shortcuts) _configure_stderr_logging(verbosity=verbosity, verbosity_shortcuts=verbosity_shortcuts)
if log_to_file is None: if log_to_file is None:

3
run_electrum
View File

@@ -325,9 +325,10 @@ def main():
import importlib.util import importlib.util
android_gui = 'kivy' if importlib.util.find_spec('kivy') else 'qml' android_gui = 'kivy' if importlib.util.find_spec('kivy') else 'qml'
config_options = { config_options = {
'verbosity': '*' if util.is_android_debug_apk() else '',
'cmd': 'gui', 'cmd': 'gui',
'gui': android_gui, 'gui': android_gui,
'single_password':True, 'single_password': True,
} }
if util.get_android_package_name() == "org.electrum.testnet.electrum": if util.get_android_package_name() == "org.electrum.testnet.electrum":
# ~hack for easier testnet builds. pkgname subject to change. # ~hack for easier testnet builds. pkgname subject to change.