From 7b7903be8d2f44fdf6a5ff5d1da6dbe1aefd7917 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 13 Oct 2022 21:22:16 +0200 Subject: [PATCH] Cleanup --- sbapp/buildozer.spec | 2 +- sbapp/main.py | 3 +-- sbapp/services/sidebandservice.py | 5 ++--- sbapp/sideband/core.py | 5 +---- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/sbapp/buildozer.spec b/sbapp/buildozer.spec index 45a01ac..adcbfcf 100644 --- a/sbapp/buildozer.spec +++ b/sbapp/buildozer.spec @@ -10,7 +10,7 @@ source.exclude_patterns = app_storage/*,venv/*,Makefile,./Makefil*,requirements, version.regex = __version__ = ['"](.*)['"] version.filename = %(source.dir)s/main.py -android.numeric_version = 20221011 +android.numeric_version = 20221013 requirements = python3==3.9.5,hostpython3==3.9.5,cryptography,cffi,pycparser,kivy==2.1.0,pygments,sdl2,sdl2_ttf==2.0.15,pillow,lxmf==0.1.9,netifaces,libbz2,pydenticon,usb4a,usbserial4a p4a.local_recipes = ../Others/python-for-android/pythonforandroid/recipes diff --git a/sbapp/main.py b/sbapp/main.py index 29656a0..ff882da 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1,5 +1,4 @@ -# TODO: Reset -__debug_build__ = True +__debug_build__ = False __disable_shaders__ = True __version__ = "0.2.3" __variant__ = "beta" diff --git a/sbapp/services/sidebandservice.py b/sbapp/services/sidebandservice.py index 0a139dd..a92768e 100644 --- a/sbapp/services/sidebandservice.py +++ b/sbapp/services/sidebandservice.py @@ -1,5 +1,4 @@ -# TODO: Reset -__debug_build__ = True +__debug_build__ = False import time import RNS @@ -7,7 +6,7 @@ from os import environ from kivy.logger import Logger, LOG_LEVELS -if __debug_build__ or args.verbose: +if __debug_build__: Logger.setLevel(LOG_LEVELS["debug"]) else: Logger.setLevel(LOG_LEVELS["error"]) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index a633124..62ca587 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -1062,8 +1062,7 @@ class SidebandCore(): self.periodic_thread.start() def __start_jobs_immediate(self): - # TODO: Reset - if True or self.log_verbose: + if self.log_verbose: selected_level = 7 else: selected_level = 2 @@ -1227,8 +1226,6 @@ class SidebandCore(): RNS.log("Error while adding RNode Interface. The contained exception was: "+str(e)) self.interface_rnode = None - - RNS.log("Reticulum started, activating LXMF...") self.setstate("init.loadingstate", "Activating LXMF Router") self.message_router = LXMF.LXMRouter(identity = self.identity, storagepath = self.lxmf_storage, autopeer = True)