From 3d6d039a489f5b65f816bd4517a9e2e4ea6a293a Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 20 Feb 2025 23:03:38 +0100 Subject: [PATCH 01/59] Updated intent filter to allow sharing any file type for attachments --- sbapp/buildozer.spec | 2 +- sbapp/patches/intent-filter.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sbapp/buildozer.spec b/sbapp/buildozer.spec index df728e8..b6b8594 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 = 20250126 +android.numeric_version = 20250220 requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,able_recipe,libwebp,libogg,libopus,opusfile,numpy,cryptography,ffpyplayer,codec2,pycodec2,sh,pynacl,typing-extensions,mistune>=3.0.2,beautifulsoup4 diff --git a/sbapp/patches/intent-filter.xml b/sbapp/patches/intent-filter.xml index 6ec9ab0..37c4df6 100644 --- a/sbapp/patches/intent-filter.xml +++ b/sbapp/patches/intent-filter.xml @@ -28,6 +28,10 @@ + + + + Date: Sat, 22 Feb 2025 21:26:44 +0100 Subject: [PATCH 02/59] Added audioop-lts on python >= 3.13 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index e6a40bf..aa03687 100644 --- a/setup.py +++ b/setup.py @@ -129,6 +129,7 @@ setuptools.setup( "pyaudio;sys.platform=='linux'", "pyobjus;sys.platform=='darwin'", "pyogg;sys.platform=='Windows' and sys.platform!='win32'", + "audioop-lts>=0.2.1;python_version>='3.13'" ], python_requires='>=3.7', ) From 63030a6f48c8249a4555d0541f49cee7b44a0360 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 23 Feb 2025 22:42:43 +0100 Subject: [PATCH 03/59] Added link stats to object details --- sbapp/sideband/core.py | 70 +++++++++++++++++++++++++++++++++++++++ sbapp/ui/objectdetails.py | 22 +++++++----- 2 files changed, 84 insertions(+), 8 deletions(-) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 36b8162..ee6a173 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -1838,6 +1838,72 @@ class SidebandCore(): RNS.log(ed, RNS.LOG_DEBUG) return None + def _get_destination_mtu(self, destination_hash): + try: + mr = self.message_router + oh = destination_hash + ol = None + if oh in mr.direct_links: + ol = mr.direct_links[oh] + elif oh in mr.backchannel_links: + ol = mr.backchannel_links[oh] + + if ol != None: + return ol.get_mtu() + + return None + + except Exception as e: + RNS.trace_exception(e) + return None + + def get_destination_mtu(self, destination_hash): + if not RNS.vendor.platformutils.is_android(): + return self._get_destination_mtu(destination_hash) + else: + if self.is_service: + return self._get_destination_mtu(destination_hash) + else: + try: + return self.service_rpc_request({"get_destination_mtu": destination_hash}) + except Exception as e: + ed = "Error while getting destination link MTU over RPC: "+str(e) + RNS.log(ed, RNS.LOG_DEBUG) + return None + + def _get_destination_edr(self, destination_hash): + try: + mr = self.message_router + oh = destination_hash + ol = None + if oh in mr.direct_links: + ol = mr.direct_links[oh] + elif oh in mr.backchannel_links: + ol = mr.backchannel_links[oh] + + if ol != None: + return ol.get_expected_rate() + + return None + + except Exception as e: + RNS.trace_exception(e) + return None + + def get_destination_edr(self, destination_hash): + if not RNS.vendor.platformutils.is_android(): + return self._get_destination_edr(destination_hash) + else: + if self.is_service: + return self._get_destination_edr(destination_hash) + else: + try: + return self.service_rpc_request({"get_destination_edr": destination_hash}) + except Exception as e: + ed = "Error while getting destination link EIFR over RPC: "+str(e) + RNS.log(ed, RNS.LOG_DEBUG) + return None + def __start_rpc_listener(self): try: RNS.log("Starting RPC listener", RNS.LOG_DEBUG) @@ -1882,6 +1948,10 @@ class SidebandCore(): connection.send(self._get_plugins_info()) elif "get_destination_establishment_rate" in call: connection.send(self._get_destination_establishment_rate(call["get_destination_establishment_rate"])) + elif "get_destination_mtu" in call: + connection.send(self._get_destination_mtu(call["get_destination_mtu"])) + elif "get_destination_edr" in call: + connection.send(self._get_destination_edr(call["get_destination_edr"])) elif "send_message" in call: args = call["send_message"] send_result = self.send_message( diff --git a/sbapp/ui/objectdetails.py b/sbapp/ui/objectdetails.py index a5ab969..0de4f3d 100644 --- a/sbapp/ui/objectdetails.py +++ b/sbapp/ui/objectdetails.py @@ -822,17 +822,23 @@ class RVDetails(MDRecycleView): if nhi and nhi != "None": self.entries.append({"icon": "routes", "text": f"Current path on [b]{nhi}[/b]", "on_release": pass_job}) - try: - ler = self.delegate.app.sideband.get_destination_establishment_rate(self.delegate.object_hash) - if ler: - lers = RNS.prettyspeed(ler, "b") - self.entries.append({"icon": "lock-check-outline", "text": f"Direct link established, LER is [b]{lers}[/b]", "on_release": pass_job}) - except Exception as e: - RNS.trace_exception(e) - if nh != RNS.Transport.PATHFINDER_M: hs = "hop" if nh == 1 else "hops" self.entries.append({"icon": "atom-variant", "text": f"Network distance is [b]{nh} {hs}[/b]", "on_release": pass_job}) + + try: + ler = self.delegate.app.sideband.get_destination_establishment_rate(self.delegate.object_hash) + mtu = self.delegate.app.sideband.get_destination_mtu(self.delegate.object_hash) or RNS.Reticulum.MTU + edr = self.delegate.app.sideband.get_destination_edr(self.delegate.object_hash) + if ler: + lers = RNS.prettyspeed(ler, "b") + mtus = RNS.prettysize(mtu) + edrs = f"{RNS.prettyspeed(edr)}" if edr != None else "" + self.entries.append({"icon": "lock-check-outline", "text": f"Link established, LER is [b]{lers}[/b], MTU is [b]{mtus}[/b]", "on_release": pass_job}) + if edr: self.entries.append({"icon": "approximately-equal", "text": f"Expected data rate is [b]{edrs}[/b]", "on_release": pass_job}) + except Exception as e: + RNS.trace_exception(e) + except Exception as e: RNS.trace_exception(e) From 88f427b97c3e275385f29e4a26fd74e89f5713a3 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 24 Feb 2025 12:39:12 +0100 Subject: [PATCH 04/59] Catch OS notification limit exceptions --- sbapp/sideband/core.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index ee6a173..4e59c16 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -993,13 +993,16 @@ class SidebandCore(): notifications_permitted = True if notifications_permitted: - if RNS.vendor.platformutils.get_platform() == "android": - if self.is_service: - self.owner_service.android_notification(title, content, group=group, context_id=context_id) + try: + if RNS.vendor.platformutils.get_platform() == "android": + if self.is_service: + self.owner_service.android_notification(title, content, group=group, context_id=context_id) + else: + plyer.notification.notify(title, content, notification_icon=self.notification_icon, context_override=None) else: - plyer.notification.notify(title, content, notification_icon=self.notification_icon, context_override=None) - else: - plyer.notification.notify(title, content, app_icon=self.icon_32) + plyer.notification.notify(title, content, app_icon=self.icon_32) + except Exception as e: + RNS.log("An error occurred while posting a notification to the operating system: {e}", RNS.LOG_ERROR) def log_announce(self, dest, app_data, dest_type, stamp_cost=None, link_stats=None): try: From fbd5896856e4051b11f83199e8c7cdee6d264c74 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 9 Mar 2025 11:15:33 +0100 Subject: [PATCH 05/59] Fixed telemetry plugin init error --- sbapp/sideband/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 4e59c16..0a4e780 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -3287,7 +3287,7 @@ class SidebandCore(): else: self.telemeter.disable(sensor) - for telemetry_plugin in self.active_telemetry_plugins: + for telemetry_plugin in self.active_telemetry_plugins.copy(): try: plugin = self.active_telemetry_plugins[telemetry_plugin] plugin.update_telemetry(self.telemeter) From 3faa7e220313333348d168044df3304fba6d3d3c Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 9 Mar 2025 14:28:03 +0100 Subject: [PATCH 06/59] Added BME280 telemetry plugin --- docs/example_plugins/bme280_telemetry.py | 67 ++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 docs/example_plugins/bme280_telemetry.py diff --git a/docs/example_plugins/bme280_telemetry.py b/docs/example_plugins/bme280_telemetry.py new file mode 100644 index 0000000..af29c70 --- /dev/null +++ b/docs/example_plugins/bme280_telemetry.py @@ -0,0 +1,67 @@ +# This plugin provides temperature, humidity +# and pressure data via a BME280 sensor +# connected over I2C. The plugin requires +# the "smbus2" and "RPi.bme280" modules to +# be available on your system. These can be +# installed with: +# +# pip install smbus2 RPi.bme280 + +import os +import RNS +from importlib.util import find_spec + +class BME280Plugin(SidebandTelemetryPlugin): + plugin_name = "telemetry_bme280" + + I2C_ADDRESS = 0x76 + I2C_BUS = 1 + + # If your BME280 has an offset from the true + # temperature, you can compensate for this + # by modifying this parameter. + TEMPERATURE_CORRECTION = 0.0 + + def start(self): + RNS.log("BME280 telemetry plugin starting...") + + if find_spec("smbus2"): import smbus2 + else: raise OSError(f"No smbus2 module available, cannot start BME280 telemetry plugin") + + if find_spec("bme280"): import bme280 + else: raise OSError(f"No bme280 module available, cannot start BME280 telemetry plugin") + + self.sensor_connected = False + + try: + self.bme280 = bme280 + self.address = self.I2C_ADDRESS + self.bus = smbus2.SMBus(self.I2C_BUS) + self.calibration = self.bme280.load_calibration_params(self.bus, self.address) + self.sensor_connected = True + self.tc = self.TEMPERATURE_CORRECTION + + except Exception as e: + RNS.log(f"Could not connect to I2C device while starting BME280 telemetry plugin", RNS.LOG_ERROR) + RNS.log(f"The contained exception was: {e}", RNS.LOG_ERROR) + + super().start() + + def stop(self): + self.bus.close() + super().stop() + + def update_telemetry(self, telemeter): + if telemeter != None: + if self.sensor_connected: + try: + sample = self.bme280.sample(self.bus, self.address, self.calibration); ts = telemeter.sensors + telemeter.synthesize("temperature"); ts["temperature"].data = {"c": round(sample.temperature+self.tc,1)} + telemeter.synthesize("humidity"); ts["humidity"].data = {"percent_relative": round(sample.humidity,1)} + telemeter.synthesize("pressure"); ts["pressure"].data = {"mbar": round(sample.pressure,1)} + + except Exception as e: + RNS.log("An error occurred while updating BME280 sensor data", RNS.LOG_ERROR) + RNS.log(f"The contained exception was: {e}", RNS.LOG_ERROR) + +plugin_class = BME280Plugin \ No newline at end of file From 902e1c54511bfc9cd42b49182fd0e6aaa57aedb4 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 9 Mar 2025 14:28:33 +0100 Subject: [PATCH 07/59] Added ringtones --- sbapp/assets/audio/notifications/ringer.opus | Bin 0 -> 32047 bytes sbapp/assets/audio/notifications/soft1.opus | Bin 0 -> 102838 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 sbapp/assets/audio/notifications/ringer.opus create mode 100644 sbapp/assets/audio/notifications/soft1.opus diff --git a/sbapp/assets/audio/notifications/ringer.opus b/sbapp/assets/audio/notifications/ringer.opus new file mode 100644 index 0000000000000000000000000000000000000000..36d00947ab23d0954daf00787082e351ada7c40a GIT binary patch literal 32047 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 uJQ2t!@1qt`~RFD(J(=FRaL) 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 literal 0 HcmV?d00001 From a0a03c9eba7cfa82e3201ed4582930df2e9e112e Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 9 Mar 2025 14:29:02 +0100 Subject: [PATCH 08/59] Added voice call service base --- sbapp/main.py | 53 ++++++++++++++ sbapp/sideband/core.py | 41 ++++++++++- sbapp/sideband/voice.py | 153 ++++++++++++++++++++++++++++++++++++++++ sbapp/ui/layouts.py | 28 +++++++- sbapp/ui/voice.py | 108 ++++++++++++++++++++++++++++ 5 files changed, 380 insertions(+), 3 deletions(-) create mode 100644 sbapp/sideband/voice.py create mode 100644 sbapp/ui/voice.py diff --git a/sbapp/main.py b/sbapp/main.py index ffb2cf4..e886cbd 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -239,6 +239,7 @@ else: from ui.conversations import Conversations, MsgSync, NewConv from ui.telemetry import Telemetry from ui.utilities import Utilities + from ui.voice import Voice from ui.objectdetails import ObjectDetails from ui.announces import Announces from ui.messages import Messages, ts_format, messages_screen_kv @@ -267,6 +268,7 @@ else: from .ui.announces import Announces from .ui.telemetry import Telemetry from .ui.utilities import Utilities + from .ui.voice import Voice from .ui.objectdetails import ObjectDetails from .ui.messages import Messages, ts_format, messages_screen_kv from .ui.helpers import ContentNavigationDrawer, DrawerList, IconListItem @@ -352,6 +354,7 @@ class SidebandApp(MDApp): self.settings_ready = False self.telemetry_ready = False self.utilities_ready = False + self.voice_ready = False self.connectivity_ready = False self.hardware_ready = False self.repository_ready = False @@ -3148,6 +3151,15 @@ class SidebandApp(MDApp): self.sideband.config["hq_ptt"] = self.settings_screen.ids.settings_hq_ptt.active self.sideband.save_configuration() + def save_voice_enabled(sender=None, event=None): + self.sideband.config["voice_enabled"] = self.settings_screen.ids.settings_voice_enabled.active + self.sideband.save_configuration() + + if self.sideband.config["voice_enabled"] == True: + self.sideband.start_voice() + else: + self.sideband.stop_voice() + def save_print_command(sender=None, event=None): if not sender.focus: in_cmd = self.settings_screen.ids.settings_print_command.text @@ -3323,6 +3335,9 @@ class SidebandApp(MDApp): self.settings_screen.ids.settings_hq_ptt.active = self.sideband.config["hq_ptt"] self.settings_screen.ids.settings_hq_ptt.bind(active=save_hq_ptt) + self.settings_screen.ids.settings_voice_enabled.active = self.sideband.config["voice_enabled"] + self.settings_screen.ids.settings_voice_enabled.bind(active=save_voice_enabled) + self.settings_screen.ids.settings_debug.active = self.sideband.config["debug"] self.settings_screen.ids.settings_debug.bind(active=save_debug) @@ -5234,6 +5249,44 @@ class SidebandApp(MDApp): self.utilities_action(direction="right") + ### voice Screen + ###################################### + + def voice_init(self): + if not self.voice_ready: + self.voice_screen = Voice(self) + self.voice_ready = True + + def voice_open(self, sender=None, direction="left", no_transition=False): + if no_transition: + self.root.ids.screen_manager.transition = self.no_transition + else: + self.root.ids.screen_manager.transition = self.slide_transition + self.root.ids.screen_manager.transition.direction = direction + + self.root.ids.screen_manager.current = "voice_screen" + self.root.ids.nav_drawer.set_state("closed") + self.sideband.setstate("app.displaying", self.root.ids.screen_manager.current) + + if no_transition: + self.root.ids.screen_manager.transition = self.slide_transition + + def voice_action(self, sender=None, direction="left"): + if self.voice_ready: + self.voice_open(direction=direction) + else: + self.loader_action(direction=direction) + def final(dt): + self.voice_init() + def o(dt): + self.voice_open(no_transition=True) + Clock.schedule_once(o, ll_ot) + Clock.schedule_once(final, ll_ft) + + def close_sub_voice_action(self, sender=None): + self.voice_action(direction="right") + + ### Telemetry Screen ###################################### diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 0a4e780..6e70381 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -167,6 +167,7 @@ class SidebandCore(): self.owner_app = owner_app self.reticulum = None self.webshare_server = None + self.voice_running = False self.telemeter = None self.telemetry_running = False self.latest_telemetry = None @@ -531,6 +532,9 @@ class SidebandCore(): self.config["telemetry_send_to_trusted"] = False self.config["telemetry_send_to_collector"] = False + # Voice + self.config["voice_enabled"] = False + if not os.path.isfile(self.db_path): self.__db_init() else: @@ -837,6 +841,9 @@ class SidebandCore(): if not "map_storage_file" in self.config: self.config["map_storage_file"] = None + if not "voice_enabled" in self.config: + self.config["voice_enabled"] = False + # Make sure we have a database if not os.path.isfile(self.db_path): self.__db_init() @@ -3715,8 +3722,8 @@ class SidebandCore(): self.periodic_thread.start() if self.is_standalone or self.is_client: - if self.config["telemetry_enabled"]: - self.run_telemetry() + if self.config["telemetry_enabled"]: self.run_telemetry() + if self.config["voice_enabled"]: self.start_voice() elif self.is_service: self.run_service_telemetry() @@ -5183,6 +5190,36 @@ class SidebandCore(): if not self.reticulum.is_connected_to_shared_instance: RNS.Transport.detach_interfaces() + def start_voice(self): + try: + if not self.voice_running: + RNS.log("Starting voice service", RNS.LOG_DEBUG) + self.voice_running = True + from .voice import ReticulumTelephone + self.telephone = ReticulumTelephone(self.identity) + ringtone_path = os.path.join(self.asset_dir, "audio", "notifications", "soft1.opus") + self.telephone.set_ringtone(ringtone_path) + + except Exception as e: + self.voice_running = False + RNS.log(f"An error occurred while starting voice services, the contained exception was: {e}", RNS.LOG_ERROR) + RNS.trace_exception(e) + + def stop_voice(self): + try: + if self.voice_running: + RNS.log("Stopping voice service", RNS.LOG_DEBUG) + if self.telephone: + self.telephone.stop() + del self.telephone + + self.telephone = None + self.voice_running = False + + except Exception as e: + RNS.log(f"An error occurred while stopping voice services, the contained exception was: {e}", RNS.LOG_ERROR) + RNS.trace_exception(e) + rns_config = """# This template is used to generate a # running configuration for Sideband's # internal RNS instance. Incorrect changes diff --git a/sbapp/sideband/voice.py b/sbapp/sideband/voice.py new file mode 100644 index 0000000..09837d0 --- /dev/null +++ b/sbapp/sideband/voice.py @@ -0,0 +1,153 @@ +import RNS +import os +import sys +import time + +from LXST._version import __version__ +from LXST.Primitives.Telephony import Telephone +from RNS.vendor.configobj import ConfigObj + +class ReticulumTelephone(): + STATE_AVAILABLE = 0x00 + STATE_CONNECTING = 0x01 + STATE_RINGING = 0x02 + STATE_IN_CALL = 0x03 + + HW_SLEEP_TIMEOUT = 15 + HW_STATE_IDLE = 0x00 + HW_STATE_DIAL = 0x01 + HW_STATE_SLEEP = 0xFF + + RING_TIME = 30 + WAIT_TIME = 60 + PATH_TIME = 10 + + def __init__(self, identity, verbosity = 0, service = False): + self.identity = identity + self.service = service + self.config = None + self.should_run = False + self.telephone = None + self.state = self.STATE_AVAILABLE + self.hw_state = self.HW_STATE_IDLE + self.hw_last_event = time.time() + self.hw_input = "" + self.direction = None + self.last_input = None + self.first_run = False + self.ringtone_path = None + self.speaker_device = None + self.microphone_device = None + self.ringer_device = None + self.phonebook = {} + self.aliases = {} + self.names = {} + + self.telephone = Telephone(self.identity, ring_time=self.RING_TIME, wait_time=self.WAIT_TIME) + self.telephone.set_ringing_callback(self.ringing) + self.telephone.set_established_callback(self.call_established) + self.telephone.set_ended_callback(self.call_ended) + self.telephone.set_speaker(self.speaker_device) + self.telephone.set_microphone(self.microphone_device) + self.telephone.set_ringer(self.ringer_device) + RNS.log(f"{self} initialised", RNS.LOG_DEBUG) + + def set_ringtone(self, ringtone_path): + if os.path.isfile(ringtone_path): + self.ringtone_path = ringtone_path + self.telephone.set_ringtone(self.ringtone_path) + + @property + def is_available(self): + return self.state == self.STATE_AVAILABLE + + @property + def is_in_call(self): + return self.state == self.STATE_IN_CALL + + @property + def is_ringing(self): + return self.state == self.STATE_RINGING + + @property + def call_is_connecting(self): + return self.state == self.STATE_CONNECTING + + @property + def hw_is_idle(self): + return self.hw_state == self.HW_STATE_IDLE + + @property + def hw_is_dialing(self): + return self.hw_state == self.HW_STATE_DIAL + + def start(self): + if not self.should_run: + self.telephone.announce() + self.should_run = True + self.run() + + def stop(self): + self.should_run = False + self.telephone.teardown() + self.telephone = None + + def dial(self, identity_hash): + self.last_dialled_identity_hash = identity_hash + self.telephone.set_busy(True) + identity_hash = bytes.fromhex(identity_hash) + destination_hash = RNS.Destination.hash_from_name_and_identity("lxst.telephony", identity_hash) + if not RNS.Transport.has_path(destination_hash): + RNS.Transport.request_path(destination_hash) + def spincheck(): return RNS.Transport.has_path(destination_hash) + self.__spin(spincheck, "Requesting path for call to "+RNS.prettyhexrep(identity_hash), self.path_time) + if not spincheck(): RNS.log("Path request timed out", RNS.LOG_DEBUG) + + self.telephone.set_busy(False) + if RNS.Transport.has_path(destination_hash): + call_hops = RNS.Transport.hops_to(destination_hash) + cs = "" if call_hops == 1 else "s" + RNS.log(f"Connecting call over {call_hops} hop{cs}...", RNS.LOG_DEBUG) + identity = RNS.Identity.recall(destination_hash) + self.call(identity) + else: + pass + + def redial(self, args=None): + if self.last_dialled_identity_hash: self.dial(self.last_dialled_identity_hash) + + def call(self, remote_identity): + RNS.log(f"Calling {RNS.prettyhexrep(remote_identity.hash)}...", RNS.LOG_DEBUG) + self.state = self.STATE_CONNECTING + self.caller = remote_identity + self.direction = "to" + self.telephone.call(self.caller) + + def ringing(self, remote_identity): + if self.hw_state == self.HW_STATE_SLEEP: self.hw_state = self.HW_STATE_IDLE + self.state = self.STATE_RINGING + self.caller = remote_identity + self.direction = "from" if self.direction == None else "to" + RNS.log(f"Incoming call from {RNS.prettyhexrep(self.caller.hash)}", RNS.LOG_DEBUG) + + def call_ended(self, remote_identity): + if self.is_in_call or self.is_ringing or self.call_is_connecting: + if self.is_in_call: RNS.log(f"Call with {RNS.prettyhexrep(self.caller.hash)} ended\n", RNS.LOG_DEBUG) + if self.is_ringing: RNS.log(f"Call {self.direction} {RNS.prettyhexrep(self.caller.hash)} was not answered\n", RNS.LOG_DEBUG) + if self.call_is_connecting: RNS.log(f"Call to {RNS.prettyhexrep(self.caller.hash)} could not be connected\n", RNS.LOG_DEBUG) + self.direction = None + self.state = self.STATE_AVAILABLE + + def call_established(self, remote_identity): + if self.call_is_connecting or self.is_ringing: + self.state = self.STATE_IN_CALL + RNS.log(f"Call established with {RNS.prettyhexrep(self.caller.hash)}", RNS.LOG_DEBUG) + + def __spin(self, until=None, msg=None, timeout=None): + if msg: RNS.log(msg, RNS.LOG_DEBUG) + if timeout != None: timeout = time.time()+timeout + while (timeout == None or time.time() timeout: + return False + else: + return True diff --git a/sbapp/ui/layouts.py b/sbapp/ui/layouts.py index 6155953..e520c34 100644 --- a/sbapp/ui/layouts.py +++ b/sbapp/ui/layouts.py @@ -96,6 +96,16 @@ MDNavigationLayout: IconLeftWidget: icon: "account-voice" on_release: root.ids.screen_manager.app.announces_action(self) + + + OneLineIconListItem: + text: "Voice" + on_release: root.ids.screen_manager.app.voice_action(self) + # _no_ripple_effect: True + + IconLeftWidget: + icon: "phone-in-talk" + on_release: root.ids.screen_manager.app.voice_action(self) # OneLineIconListItem: @@ -1790,7 +1800,7 @@ MDScreen: height: dp(48) MDLabel: - text: "Use high-quality voice for PTT" + text: "High-quality codec for LXMF PTT" font_style: "H6" MDSwitch: @@ -1799,6 +1809,22 @@ MDScreen: disabled: False active: False + MDBoxLayout: + orientation: "horizontal" + size_hint_y: None + padding: [0,0,dp(24),dp(0)] + height: dp(48) + + MDLabel: + text: "Enable voice calls" + font_style: "H6" + + MDSwitch: + id: settings_voice_enabled + pos_hint: {"center_y": 0.3} + disabled: False + active: False + # MDBoxLayout: # orientation: "horizontal" # size_hint_y: None diff --git a/sbapp/ui/voice.py b/sbapp/ui/voice.py new file mode 100644 index 0000000..2c2c135 --- /dev/null +++ b/sbapp/ui/voice.py @@ -0,0 +1,108 @@ +import time +import RNS + +from typing import Union +from kivy.metrics import dp,sp +from kivy.lang.builder import Builder +from kivy.core.clipboard import Clipboard +from kivy.utils import escape_markup +from kivymd.uix.recycleview import MDRecycleView +from kivymd.uix.list import OneLineIconListItem +from kivymd.uix.pickers import MDColorPicker +from kivymd.uix.button import MDRectangleFlatButton +from kivymd.uix.dialog import MDDialog +from kivymd.icon_definitions import md_icons +from kivymd.toast import toast +from kivy.properties import StringProperty, BooleanProperty +from kivy.effects.scroll import ScrollEffect +from kivy.clock import Clock +from sideband.sense import Telemeter +import threading +from datetime import datetime + +if RNS.vendor.platformutils.get_platform() == "android": + from ui.helpers import ts_format + from android.permissions import request_permissions, check_permission +else: + from .helpers import ts_format + +class Voice(): + def __init__(self, app): + self.app = app + self.screen = None + self.rnstatus_screen = None + self.rnstatus_instance = None + self.logviewer_screen = None + + if not self.app.root.ids.screen_manager.has_screen("voice_screen"): + self.screen = Builder.load_string(layout_voice_screen) + self.screen.app = self.app + self.screen.delegate = self + self.app.root.ids.screen_manager.add_widget(self.screen) + + self.screen.ids.voice_scrollview.effect_cls = ScrollEffect + info = "Voice services UI" + info += "" + + if self.app.theme_cls.theme_style == "Dark": + info = "[color=#"+self.app.dark_theme_text_color+"]"+info+"[/color]" + + self.screen.ids.voice_info.text = info + +layout_voice_screen = """ +MDScreen: + name: "voice_screen" + + BoxLayout: + orientation: "vertical" + + MDTopAppBar: + title: "Voice" + anchor_title: "left" + elevation: 0 + left_action_items: + [['menu', lambda x: root.app.nav_drawer.set_state("open")]] + right_action_items: + [ + ['close', lambda x: root.app.close_any_action(self)], + ] + + ScrollView: + id: voice_scrollview + + MDBoxLayout: + orientation: "vertical" + size_hint_y: None + height: self.minimum_height + padding: [dp(28), dp(32), dp(28), dp(16)] + + # MDLabel: + # text: "Utilities & Tools" + # font_style: "H6" + + MDLabel: + id: voice_info + markup: True + text: "" + size_hint_y: None + text_size: self.width, None + height: self.texture_size[1] + + MDBoxLayout: + orientation: "vertical" + spacing: "24dp" + size_hint_y: None + height: self.minimum_height + padding: [dp(0), dp(35), dp(0), dp(35)] + + MDRectangleFlatIconButton: + id: rnstatus_button + icon: "wifi-check" + text: "Reticulum Status" + padding: [dp(0), dp(14), dp(0), dp(14)] + icon_size: dp(24) + font_size: dp(16) + size_hint: [1.0, None] + on_release: root.delegate.rnstatus_action(self) + disabled: False +""" From 143f440df7a0fd945ddeb8004a55cc620729efe7 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 9 Mar 2025 18:32:31 +0100 Subject: [PATCH 09/59] Added basic LXST voice call UI --- sbapp/main.py | 39 ++++++--- sbapp/sideband/core.py | 28 ++++++- sbapp/sideband/voice.py | 15 ++-- sbapp/ui/conversations.py | 126 +++++++++++++++++++++------- sbapp/ui/voice.py | 169 ++++++++++++++++++++++++++++++++------ 5 files changed, 298 insertions(+), 79 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index e886cbd..ea0631e 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1,6 +1,6 @@ __debug_build__ = False __disable_shaders__ = False -__version__ = "1.4.0" +__version__ = "1.5.0" __variant__ = "" import sys @@ -1597,13 +1597,17 @@ class SidebandApp(MDApp): self.conversation_action(item) def conversation_action(self, sender): - context_dest = sender.sb_uid - def cb(dt): - self.open_conversation(context_dest) - def cbu(dt): - self.conversations_view.update() - Clock.schedule_once(cb, 0.15) - Clock.schedule_once(cbu, 0.15+0.25) + if sender.conv_type == self.sideband.CONV_P2P: + context_dest = sender.sb_uid + def cb(dt): self.open_conversation(context_dest) + def cbu(dt): self.conversations_view.update() + Clock.schedule_once(cb, 0.15) + Clock.schedule_once(cbu, 0.15+0.25) + + elif sender.conv_type == self.sideband.CONV_VOICE: + identity_hash = sender.sb_uid + def cb(dt): self.dial_action(identity_hash) + Clock.schedule_once(cb, 0.15) def open_conversation(self, context_dest, direction="left"): self.rec_dialog_is_open = False @@ -2750,7 +2754,8 @@ class SidebandApp(MDApp): n_address = dialog.d_content.ids["n_address_field"].text n_name = dialog.d_content.ids["n_name_field"].text n_trusted = dialog.d_content.ids["n_trusted"].active - new_result = self.sideband.new_conversation(n_address, n_name, n_trusted) + n_voice_only = dialog.d_content.ids["n_voice_only"].active + new_result = self.sideband.new_conversation(n_address, n_name, n_trusted, n_voice_only) except Exception as e: RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR) @@ -5257,7 +5262,7 @@ class SidebandApp(MDApp): self.voice_screen = Voice(self) self.voice_ready = True - def voice_open(self, sender=None, direction="left", no_transition=False): + def voice_open(self, sender=None, direction="left", no_transition=False, dial_on_complete=None): if no_transition: self.root.ids.screen_manager.transition = self.no_transition else: @@ -5271,21 +5276,29 @@ class SidebandApp(MDApp): if no_transition: self.root.ids.screen_manager.transition = self.slide_transition - def voice_action(self, sender=None, direction="left"): + self.voice_screen.update_call_status() + if dial_on_complete: + self.voice_screen.dial_target = dial_on_complete + self.voice_screen.screen.ids.identity_hash.text = RNS.hexrep(dial_on_complete, delimit=False) + Clock.schedule_once(self.voice_screen.dial_action, 0.25) + + def voice_action(self, sender=None, direction="left", dial_on_complete=None): if self.voice_ready: - self.voice_open(direction=direction) + self.voice_open(direction=direction, dial_on_complete=dial_on_complete) else: self.loader_action(direction=direction) def final(dt): self.voice_init() def o(dt): - self.voice_open(no_transition=True) + self.voice_open(no_transition=True, dial_on_complete=dial_on_complete) Clock.schedule_once(o, ll_ot) Clock.schedule_once(final, ll_ft) def close_sub_voice_action(self, sender=None): self.voice_action(direction="right") + def dial_action(self, identity_hash): + self.voice_action(dial_on_complete=identity_hash) ### Telemetry Screen ###################################### diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 6e70381..291a437 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -107,6 +107,7 @@ class SidebandCore(): CONV_P2P = 0x01 CONV_GROUP = 0x02 CONV_BROADCAST = 0x03 + CONV_VOICE = 0x04 MAX_ANNOUNCES = 24 @@ -2639,6 +2640,7 @@ class SidebandCore(): "last_rx": last_rx, "last_tx": last_tx, "last_activity": last_activity, + "type": entry[4], "trust": entry[5], "data": data, } @@ -2790,6 +2792,27 @@ class SidebandCore(): self.__event_conversations_changed() + def _db_create_voice_object(self, identity_hash, name = None, trust = False): + RNS.log("Creating voice object for "+RNS.prettyhexrep(identity_hash), RNS.LOG_DEBUG) + with self.db_lock: + db = self.__db_connect() + dbc = db.cursor() + + def_name = "".encode("utf-8") + query = "INSERT INTO conv (dest_context, last_tx, last_rx, unread, type, trust, name, data) values (?, ?, ?, ?, ?, ?, ?, ?)" + data = (identity_hash, 0, time.time(), 0, SidebandCore.CONV_VOICE, 0, def_name, msgpack.packb(None)) + + dbc.execute(query, data) + db.commit() + + if trust: + self._db_conversation_set_trusted(identity_hash, True) + + if name != None and name != "": + self._db_conversation_set_name(identity_hash, name) + + self.__event_conversations_changed() + def _db_delete_message(self, msg_hash): RNS.log("Deleting message "+RNS.prettyhexrep(msg_hash)) with self.db_lock: @@ -4630,7 +4653,7 @@ class SidebandCore(): RNS.log("Error while sending message: "+str(e), RNS.LOG_ERROR) return False - def new_conversation(self, dest_str, name = "", trusted = False): + def new_conversation(self, dest_str, name = "", trusted = False, voice_only = False): if len(dest_str) != RNS.Reticulum.TRUNCATED_HASHLENGTH//8*2: return False @@ -4640,7 +4663,8 @@ class SidebandCore(): RNS.log("Cannot create conversation with own LXMF address", RNS.LOG_ERROR) return False else: - self._db_create_conversation(addr_b, name, trusted) + if not voice_only: self._db_create_conversation(addr_b, name, trusted) + else: self._db_create_voice_object(addr_b, name, trusted) except Exception as e: RNS.log("Error while creating conversation: "+str(e), RNS.LOG_ERROR) diff --git a/sbapp/sideband/voice.py b/sbapp/sideband/voice.py index 09837d0..eb346f0 100644 --- a/sbapp/sideband/voice.py +++ b/sbapp/sideband/voice.py @@ -92,18 +92,13 @@ class ReticulumTelephone(): self.telephone.teardown() self.telephone = None + def hangup(self): self.telephone.hangup() + def answer(self): self.telephone.answer(self.caller) + def set_busy(self, busy): self.telephone.set_busy(busy) + def dial(self, identity_hash): self.last_dialled_identity_hash = identity_hash - self.telephone.set_busy(True) - identity_hash = bytes.fromhex(identity_hash) destination_hash = RNS.Destination.hash_from_name_and_identity("lxst.telephony", identity_hash) - if not RNS.Transport.has_path(destination_hash): - RNS.Transport.request_path(destination_hash) - def spincheck(): return RNS.Transport.has_path(destination_hash) - self.__spin(spincheck, "Requesting path for call to "+RNS.prettyhexrep(identity_hash), self.path_time) - if not spincheck(): RNS.log("Path request timed out", RNS.LOG_DEBUG) - - self.telephone.set_busy(False) if RNS.Transport.has_path(destination_hash): call_hops = RNS.Transport.hops_to(destination_hash) cs = "" if call_hops == 1 else "s" @@ -111,7 +106,7 @@ class ReticulumTelephone(): identity = RNS.Identity.recall(destination_hash) self.call(identity) else: - pass + return "no_path" def redial(self, args=None): if self.last_dialled_identity_hash: self.dial(self.last_dialled_identity_hash) diff --git a/sbapp/ui/conversations.py b/sbapp/ui/conversations.py index cc58db1..d677c73 100644 --- a/sbapp/ui/conversations.py +++ b/sbapp/ui/conversations.py @@ -6,6 +6,7 @@ from kivy.uix.boxlayout import BoxLayout from kivy.properties import StringProperty, BooleanProperty from kivymd.uix.list import MDList, IconLeftWidget, IconRightWidget, OneLineAvatarIconListItem from kivymd.uix.menu import MDDropdownMenu +from kivymd.toast import toast from kivy.uix.gridlayout import GridLayout from kivy.uix.boxlayout import BoxLayout from kivy.clock import Clock @@ -53,6 +54,7 @@ class Conversations(): self.app.root.ids.screen_manager.add_widget(self.screen) self.conversation_dropdown = None + self.voice_dropdown = None self.delete_dialog = None self.clear_dialog = None self.clear_telemetry_dialog = None @@ -91,6 +93,7 @@ class Conversations(): self.app.sideband.setstate("wants.viewupdate.conversations", False) def trust_icon(self, conv): + conv_type = conv["type"] context_dest = conv["dest"] unread = conv["unread"] appearance = self.app.sideband.peer_appearance(context_dest, conv=conv) @@ -106,25 +109,28 @@ class Conversations(): trust_icon = appearance[0] or da[0]; else: - if self.app.sideband.requests_allowed_from(context_dest): - if unread: - if is_trusted: - trust_icon = "email-seal" - else: - trust_icon = "email" - else: - trust_icon = "account-lock-open" + if conv_type == self.app.sideband.CONV_VOICE: + trust_icon = "phone" else: - if is_trusted: + if self.app.sideband.requests_allowed_from(context_dest): if unread: - trust_icon = "email-seal" + if is_trusted: + trust_icon = "email-seal" + else: + trust_icon = "email" else: - trust_icon = "account-check" + trust_icon = "account-lock-open" else: - if unread: - trust_icon = "email" + if is_trusted: + if unread: + trust_icon = "email-seal" + else: + trust_icon = "account-check" else: - trust_icon = "account-question" + if unread: + trust_icon = "email" + else: + trust_icon = "account-question" return trust_icon @@ -166,6 +172,7 @@ class Conversations(): iconl._default_icon_pad = dp(ic_p) iconl.icon_size = dp(ic_s) + iconl.conv_type = conv["type"] return iconl @@ -187,6 +194,7 @@ class Conversations(): for conv in self.context_dests: context_dest = conv["dest"] + conv_type = conv["type"] unread = conv["unread"] last_activity = conv["last_activity"] @@ -203,6 +211,7 @@ class Conversations(): item.sb_uid = context_dest item.sb_unread = unread iconl.sb_uid = context_dest + item.conv_type = conv_type def gen_edit(item): def x(): @@ -366,23 +375,58 @@ class Conversations(): self.delete_dialog.open() return x - # def gen_move_to(item): - # def x(): - # item.dmenu.dismiss() - # self.app.sideband.conversation_set_object(self.conversation_dropdown.context_dest, not self.app.sideband.is_object(self.conversation_dropdown.context_dest)) - # self.app.conversations_view.update() - # return x - def gen_copy_addr(item): def x(): Clipboard.copy(RNS.hexrep(self.conversation_dropdown.context_dest, delimit=False)) + self.voice_dropdown.dismiss() + self.conversation_dropdown.dismiss() + return x + + def gen_call(item): + def x(): + identity = RNS.Identity.recall(self.conversation_dropdown.context_dest) + if identity: self.app.dial_action(identity.hash) + else: toast("Can't call, identity unknown") item.dmenu.dismiss() return x item.iconr = IconRightWidget(icon="dots-vertical"); + if self.voice_dropdown == None: + dmi_h = 40 + dmv_items = [ + { + "viewclass": "OneLineListItem", + "text": "Edit", + "height": dp(dmi_h), + "on_release": gen_edit(item) + }, + { + "text": "Copy Identity Hash", + "viewclass": "OneLineListItem", + "height": dp(dmi_h), + "on_release": gen_copy_addr(item) + }, + { + "text": "Delete", + "viewclass": "OneLineListItem", + "height": dp(dmi_h), + "on_release": gen_del(item) + } + ] + + self.voice_dropdown = MDDropdownMenu( + caller=item.iconr, + items=dmv_items, + position="auto", + width=dp(256), + elevation=0, + radius=dp(3), + ) + self.voice_dropdown.effect_cls = ScrollEffect + self.voice_dropdown.md_bg_color = self.app.color_hover + if self.conversation_dropdown == None: - obj_str = "conversations" if is_object else "objects" dmi_h = 40 dm_items = [ { @@ -391,18 +435,18 @@ class Conversations(): "height": dp(dmi_h), "on_release": gen_edit(item) }, + { + "viewclass": "OneLineListItem", + "text": "Call", + "height": dp(dmi_h), + "on_release": gen_call(item) + }, { "text": "Copy Address", "viewclass": "OneLineListItem", "height": dp(dmi_h), "on_release": gen_copy_addr(item) }, - # { - # "text": "Move to objects", - # "viewclass": "OneLineListItem", - # "height": dp(dmi_h), - # "on_release": gen_move_to(item) - # }, { "text": "Clear Messages", "viewclass": "OneLineListItem", @@ -434,11 +478,15 @@ class Conversations(): self.conversation_dropdown.effect_cls = ScrollEffect self.conversation_dropdown.md_bg_color = self.app.color_hover - item.dmenu = self.conversation_dropdown + if conv_type == self.app.sideband.CONV_VOICE: + item.dmenu = self.voice_dropdown + else: + item.dmenu = self.conversation_dropdown def callback_factory(ref, dest): def x(sender): self.conversation_dropdown.context_dest = dest + self.voice_dropdown.context_dest = dest ref.dmenu.caller = ref.iconr ref.dmenu.open() return x @@ -448,6 +496,7 @@ class Conversations(): item.add_widget(item.iconr) item.trusted = self.app.sideband.is_trusted(context_dest, conv_data=existing_conv) + item.conv_type = conv_type self.added_item_dests.append(context_dest) self.list.add_widget(item) @@ -519,7 +568,7 @@ Builder.load_string(""" orientation: "vertical" spacing: "24dp" size_hint_y: None - height: dp(250) + height: dp(260) MDTextField: id: n_address_field @@ -540,7 +589,7 @@ Builder.load_string(""" orientation: "horizontal" size_hint_y: None padding: [0,0,dp(8),dp(24)] - height: dp(48) + height: dp(24) MDLabel: id: "trusted_switch_label" text: "Trusted" @@ -551,6 +600,21 @@ Builder.load_string(""" pos_hint: {"center_y": 0.3} active: False + MDBoxLayout: + orientation: "horizontal" + size_hint_y: None + padding: [0,0,dp(8),dp(24)] + height: dp(24) + MDLabel: + id: "trusted_switch_label" + text: "Voice Only" + font_style: "H6" + + MDSwitch: + id: n_voice_only + pos_hint: {"center_y": 0.3} + active: False + orientation: "vertical" spacing: "16dp" diff --git a/sbapp/ui/voice.py b/sbapp/ui/voice.py index 2c2c135..f07fc04 100644 --- a/sbapp/ui/voice.py +++ b/sbapp/ui/voice.py @@ -30,9 +30,10 @@ class Voice(): def __init__(self, app): self.app = app self.screen = None - self.rnstatus_screen = None - self.rnstatus_instance = None - self.logviewer_screen = None + self.settings_screen = None + self.dial_target = None + self.ui_updater = None + self.path_requesting = None if not self.app.root.ids.screen_manager.has_screen("voice_screen"): self.screen = Builder.load_string(layout_voice_screen) @@ -41,13 +42,131 @@ class Voice(): self.app.root.ids.screen_manager.add_widget(self.screen) self.screen.ids.voice_scrollview.effect_cls = ScrollEffect - info = "Voice services UI" - info += "" + # info = "Voice services UI" + # info += "" - if self.app.theme_cls.theme_style == "Dark": - info = "[color=#"+self.app.dark_theme_text_color+"]"+info+"[/color]" + # if self.app.theme_cls.theme_style == "Dark": + # info = "[color=#"+self.app.dark_theme_text_color+"]"+info+"[/color]" - self.screen.ids.voice_info.text = info + # self.screen.ids.voice_info.text = info + + def update_call_status(self, dt=None): + if self.app.root.ids.screen_manager.current == "voice_screen": + if self.ui_updater == None: self.ui_updater = Clock.schedule_interval(self.update_call_status, 0.5) + else: + if self.ui_updater: self.ui_updater.cancel() + + db = self.screen.ids.dial_button + ih = self.screen.ids.identity_hash + if self.app.sideband.voice_running: + telephone = self.app.sideband.telephone + if self.path_requesting: + db.disabled = True + ih.disabled = True + + else: + if telephone.is_available: + ih.disabled = False + self.target_input_action(ih) + else: + ih.disabled = True + + if telephone.is_in_call or telephone.call_is_connecting: + ih.disabled = True + db.disabled = False + db.text = "Hang up" + db.icon = "phone-hangup" + + elif telephone.is_ringing: + ih.disabled = True + db.disabled = False + db.text = "Answer" + db.icon = "phone-ring" + if telephone.caller: ih.text = RNS.hexrep(telephone.caller.hash, delimit=False) + + else: + db.disabled = True; db.text = "Voice calls disabled" + ih.disabled = True + + def target_valid(self): + if self.app.sideband.voice_running: + db = self.screen.ids.dial_button + db.disabled = False; db.text = "Call" + db.icon = "phone-outgoing" + + def target_invalid(self): + if self.app.sideband.voice_running: + db = self.screen.ids.dial_button + db.disabled = True; db.text = "Call" + db.icon = "phone-outgoing" + + def target_input_action(self, sender): + if sender: + target_hash = sender.text + if len(target_hash) == RNS.Reticulum.TRUNCATED_HASHLENGTH//8*2: + try: + identity_hash = bytes.fromhex(target_hash) + self.dial_target = identity_hash + self.target_valid() + + except Exception as e: self.target_invalid() + else: self.target_invalid() + + def request_path(self, destination_hash): + if not self.path_requesting: + self.app.sideband.telephone.set_busy(True) + toast("Requesting path...") + self.screen.ids.dial_button.disabled = True + self.path_requesting = destination_hash + RNS.Transport.request_path(destination_hash) + threading.Thread(target=self._path_wait_job, daemon=True).start() + + else: + toast("Waiting for path request answer...") + + def _path_wait_job(self): + timeout = time.time()+self.app.sideband.telephone.PATH_TIME + while not RNS.Transport.has_path(self.path_requesting) and time.time() < timeout: + time.sleep(0.25) + + self.app.sideband.telephone.set_busy(False) + if RNS.Transport.has_path(self.path_requesting): + RNS.log(f"Calling {RNS.prettyhexrep(self.dial_target)}...", RNS.LOG_DEBUG) + self.app.sideband.telephone.dial(self.dial_target) + Clock.schedule_once(self.update_call_status, 0.1) + + else: + Clock.schedule_once(self._path_request_failed, 0.05) + Clock.schedule_once(self.update_call_status, 0.1) + + self.path_requesting = None + self.update_call_status() + + def _path_request_failed(self, dt): + toast("Path request timed out") + + def dial_action(self, sender=None): + if self.app.sideband.voice_running: + if self.app.sideband.telephone.is_available: + + destination_hash = RNS.Destination.hash_from_name_and_identity("lxst.telephony", self.dial_target) + if not RNS.Transport.has_path(destination_hash): + self.request_path(destination_hash) + + else: + RNS.log(f"Calling {RNS.prettyhexrep(self.dial_target)}...", RNS.LOG_DEBUG) + self.app.sideband.telephone.dial(self.dial_target) + self.update_call_status() + + elif self.app.sideband.telephone.is_in_call or self.app.sideband.telephone.call_is_connecting: + RNS.log(f"Hanging up", RNS.LOG_DEBUG) + self.app.sideband.telephone.hangup() + self.update_call_status() + + elif self.app.sideband.telephone.is_ringing: + RNS.log(f"Answering", RNS.LOG_DEBUG) + self.app.sideband.telephone.answer() + self.update_call_status() layout_voice_screen = """ MDScreen: @@ -76,17 +195,21 @@ MDScreen: height: self.minimum_height padding: [dp(28), dp(32), dp(28), dp(16)] - # MDLabel: - # text: "Utilities & Tools" - # font_style: "H6" - - MDLabel: - id: voice_info - markup: True - text: "" + MDBoxLayout: + orientation: "vertical" + # spacing: "24dp" size_hint_y: None - text_size: self.width, None - height: self.texture_size[1] + height: self.minimum_height + padding: [dp(0), dp(12), dp(0), dp(0)] + + MDTextField: + id: identity_hash + hint_text: "Identity hash" + mode: "rectangle" + # size_hint: [1.0, None] + pos_hint: {"center_x": .5} + max_text_length: 32 + on_text: root.delegate.target_input_action(self) MDBoxLayout: orientation: "vertical" @@ -96,13 +219,13 @@ MDScreen: padding: [dp(0), dp(35), dp(0), dp(35)] MDRectangleFlatIconButton: - id: rnstatus_button - icon: "wifi-check" - text: "Reticulum Status" + id: dial_button + icon: "phone-outgoing" + text: "Call" padding: [dp(0), dp(14), dp(0), dp(14)] icon_size: dp(24) font_size: dp(16) size_hint: [1.0, None] - on_release: root.delegate.rnstatus_action(self) - disabled: False + on_release: root.delegate.dial_action(self) + disabled: True """ From 1c9342d772a374bfd7a481451451869279b912f0 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 9 Mar 2025 19:16:54 +0100 Subject: [PATCH 10/59] Added full RNS status button on Android --- .gitignore | 1 + sbapp/Makefile | 3 +++ sbapp/main.py | 19 ++++++++++++++----- setup.py | 1 + 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d7d285d..7750d9e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ sbapp/bin sbapp/app_storage sbapp/RNS sbapp/LXMF +sbapp/LXST sbapp/precompiled sbapp/*.DS_Store sbapp/*.pyc diff --git a/sbapp/Makefile b/sbapp/Makefile index b6b55dc..d0f9028 100644 --- a/sbapp/Makefile +++ b/sbapp/Makefile @@ -97,6 +97,9 @@ getrns: -(rm ./RNS/__pycache__ -r) (cp -rv ../../LXMF/LXMF ./;rm ./LXMF/Utilities/LXMF) -(rm ./LXMF/__pycache__ -r) + (cp -rv ../../LXST/LXST ./;rm ./LXST/Utilities/LXST) + -(rm ./LXST/__pycache__ -r) + -(rm ./LXST/Utilities/__pycache__ -r) cleanrns: -(rm ./RNS -r) diff --git a/sbapp/main.py b/sbapp/main.py index ea0631e..c816eb8 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -2572,21 +2572,27 @@ class SidebandApp(MDApp): if RNS.vendor.platformutils.is_android(): hs = dp(22) yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18)) + full_button = MDRectangleFlatButton(text="Full RNS Status",font_size=dp(18), theme_text_color="Custom", line_color=self.color_accept, text_color=self.color_accept) dialog = MDDialog( title="Connectivity Status", text=str(self.get_connectivity_text()), - buttons=[ yes_button ], + buttons=[full_button, yes_button], # elevation=0, ) def cs_updater(dt): dialog.text = str(self.get_connectivity_text()) def dl_yes(s): - self.connectivity_updater.cancel() dialog.dismiss() if self.connectivity_updater != None: self.connectivity_updater.cancel() + def cb_rns(sender): + dialog.dismiss() + if self.connectivity_updater != None: + self.connectivity_updater.cancel() + self.rnstatus_action() yes_button.bind(on_release=dl_yes) + full_button.bind(on_release=cb_rns) dialog.open() if self.connectivity_updater != None: @@ -2595,9 +2601,12 @@ class SidebandApp(MDApp): self.connectivity_updater = Clock.schedule_interval(cs_updater, 2.0) else: - if not self.utilities_ready: - self.utilities_init() - self.utilities_screen.rnstatus_action() + self.rnstatus_action() + + def rnstatus_action(self, sender=None): + if not self.utilities_ready: + self.utilities_init() + self.utilities_screen.rnstatus_action() def ingest_lxm_action(self, sender): def cb(dt): diff --git a/setup.py b/setup.py index aa03687..8d4fea9 100644 --- a/setup.py +++ b/setup.py @@ -123,6 +123,7 @@ setuptools.setup( "ffpyplayer", "sh", "numpy<=1.26.4", + "lxst>=0.2.2", "mistune>=3.0.2", "beautifulsoup4", "pycodec2;sys.platform!='Windows' and sys.platform!='win32' and sys.platform!='darwin'", From 9e058cc12ede4643685c652b9ab7944159e5d154 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 9 Mar 2025 20:44:48 +0100 Subject: [PATCH 11/59] Fixed inadverdent audio message play on swipe back --- sbapp/ui/messages.py | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sbapp/ui/messages.py b/sbapp/ui/messages.py index 6eb696f..3a0722c 100644 --- a/sbapp/ui/messages.py +++ b/sbapp/ui/messages.py @@ -730,16 +730,23 @@ class Messages(): if has_audio: def play_audio(sender): - self.app.play_audio_field(sender.audio_field) - stored_color = sender.md_bg_color - if sender.lsource == self.app.sideband.lxmf_destination.hash: - sender.md_bg_color = mdc(c_delivered, intensity_play) - else: - sender.md_bg_color = mdc(c_received, intensity_play) + touch_event = None; block_play = False + if sender and hasattr(sender, "last_touch"): touch_event = sender.last_touch + if touch_event and hasattr(touch_event, "dpos"): + delta = abs(touch_event.dpos[0]) + abs(touch_event.dpos[1]) + if delta >= 2.0: block_play = True - def cb(dt): - sender.md_bg_color = stored_color - Clock.schedule_once(cb, 0.25) + if not block_play: + self.app.play_audio_field(sender.audio_field) + stored_color = sender.md_bg_color + if sender.lsource == self.app.sideband.lxmf_destination.hash: + sender.md_bg_color = mdc(c_delivered, intensity_play) + else: + sender.md_bg_color = mdc(c_received, intensity_play) + + def cb(dt): + sender.md_bg_color = stored_color + Clock.schedule_once(cb, 0.25) item.has_audio = True item.audio_size = len(audio_field[1]) From b1678a1532f6eaf584b56c7ea4e38c759965ba5f Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 10 Mar 2025 17:25:40 +0100 Subject: [PATCH 12/59] Voice call UI additions --- sbapp/main.py | 31 ++++++++++++++++++++++++++++++- sbapp/sideband/core.py | 27 ++++++++++++++++++++++++++- sbapp/sideband/voice.py | 5 ++++- sbapp/ui/voice.py | 4 +++- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index c816eb8..15f136b 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1096,6 +1096,10 @@ class SidebandApp(MDApp): self.hw_error_dialog.open() self.hw_error_dialog.is_open = True + incoming_call = self.sideband.getstate("voice.incoming_call") + if incoming_call: + self.sideband.setstate("voice.incoming_call", None) + toast(f"Call from {incoming_call}", duration=7) if self.root.ids.screen_manager.current == "messages_screen": self.messages_view.update() @@ -1370,6 +1374,15 @@ class SidebandApp(MDApp): if text == "o": self.objects_action() + if text == "e": + self.voice_action() + + if text == " ": + self.voice_answer_action() + + if text == ".": + self.voice_reject_action() + if text == "r": if self.root.ids.screen_manager.current == "conversations_screen": if self.include_objects: @@ -5309,6 +5322,16 @@ class SidebandApp(MDApp): def dial_action(self, identity_hash): self.voice_action(dial_on_complete=identity_hash) + def voice_answer_action(self, sender=None): + if self.sideband.voice_running: + if self.sideband.telephone.is_ringing: self.sideband.telephone.answer() + + def voice_reject_action(self, sender=None): + if self.sideband.voice_running: + if self.sideband.telephone.is_ringing or self.sideband.telephone.is_in_call: + self.sideband.telephone.hangup() + toast("Call ended") + ### Telemetry Screen ###################################### @@ -6241,15 +6264,21 @@ If you use Reticulum and LXMF on hardware that does not carry any identifiers ti - [b]Ctrl-Shift-F[/b] add file - [b]Ctrl-D[/b] or [b]Ctrl-S[/b] Send message - [b]Voice & PTT[/b] + [b]Voice & PTT Messages[/b] - [b]Space[/b] Start/stop recording - [b]Enter[/b] Save recording to message - With PTT enabled, hold [b]Space[/b] to talk + [b]Voice Calls[/b] + - [b]Ctrl-Space[/b] Answer incoming call + - [b]Ctrl-.[/b] Reject incoming call + - [b]Ctrl-.[/b] Hang up active call + [b]Navigation[/b] - [b]Ctrl-[i]n[/i][/b] Go to conversation number [i]n[/i] - [b]Ctrl-R[/b] Go to Conversations - [b]Ctrl-O[/b] Go to Objects & Devices + - [b]Ctrl-E[/b] Go to Voice - [b]Ctrl-L[/b] Go to Announce Stream - [b]Ctrl-M[/b] Go to Situation Map - [b]Ctrl-U[/b] Go to Utilities diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 291a437..168cb7c 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -1224,6 +1224,27 @@ class SidebandCore(): RNS.log("Could not decode a valid peer name from data: "+str(e), RNS.LOG_DEBUG) return RNS.prettyhexrep(context_dest) + def voice_display_name(self, identity_hash): + context_dest = identity_hash + if context_dest == self.lxmf_destination.hash: + return self.config["display_name"] + + try: + lxmf_destination_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", identity_hash) + existing_voice = self._db_conversation(context_dest) + existing_lxmf = self._db_conversation(lxmf_destination_hash) + + print(RNS.prettyhexrep(lxmf_destination_hash)) + print(f"VOICE {existing_voice}") + print(f"LXMF {existing_lxmf}") + + if existing_lxmf: return self.peer_display_name(lxmf_destination_hash) + else: return self.peer_display_name(identity_hash) + + except Exception as e: + RNS.log("Could not decode a valid peer name from data: "+str(e), RNS.LOG_DEBUG) + return RNS.prettyhexrep(context_dest) + def clear_conversation(self, context_dest): self._db_clear_conversation(context_dest) @@ -5220,7 +5241,7 @@ class SidebandCore(): RNS.log("Starting voice service", RNS.LOG_DEBUG) self.voice_running = True from .voice import ReticulumTelephone - self.telephone = ReticulumTelephone(self.identity) + self.telephone = ReticulumTelephone(self.identity, owner=self) ringtone_path = os.path.join(self.asset_dir, "audio", "notifications", "soft1.opus") self.telephone.set_ringtone(ringtone_path) @@ -5244,6 +5265,10 @@ class SidebandCore(): RNS.log(f"An error occurred while stopping voice services, the contained exception was: {e}", RNS.LOG_ERROR) RNS.trace_exception(e) + def incoming_call(self, remote_identity): + display_name = self.voice_display_name(remote_identity.hash) + self.setstate("voice.incoming_call", display_name) + rns_config = """# This template is used to generate a # running configuration for Sideband's # internal RNS instance. Incorrect changes diff --git a/sbapp/sideband/voice.py b/sbapp/sideband/voice.py index eb346f0..3754fc1 100644 --- a/sbapp/sideband/voice.py +++ b/sbapp/sideband/voice.py @@ -22,9 +22,10 @@ class ReticulumTelephone(): WAIT_TIME = 60 PATH_TIME = 10 - def __init__(self, identity, verbosity = 0, service = False): + def __init__(self, identity, owner = None, service = False): self.identity = identity self.service = service + self.owner = owner self.config = None self.should_run = False self.telephone = None @@ -124,6 +125,8 @@ class ReticulumTelephone(): self.caller = remote_identity self.direction = "from" if self.direction == None else "to" RNS.log(f"Incoming call from {RNS.prettyhexrep(self.caller.hash)}", RNS.LOG_DEBUG) + if self.owner: + self.owner.incoming_call(remote_identity) def call_ended(self, remote_identity): if self.is_in_call or self.is_ringing or self.call_is_connecting: diff --git a/sbapp/ui/voice.py b/sbapp/ui/voice.py index f07fc04..fa00ea0 100644 --- a/sbapp/ui/voice.py +++ b/sbapp/ui/voice.py @@ -54,7 +54,9 @@ class Voice(): if self.app.root.ids.screen_manager.current == "voice_screen": if self.ui_updater == None: self.ui_updater = Clock.schedule_interval(self.update_call_status, 0.5) else: - if self.ui_updater: self.ui_updater.cancel() + if self.ui_updater: + self.ui_updater.cancel() + self.ui_updater = None db = self.screen.ids.dial_button ih = self.screen.ids.identity_hash From a24f1f107357ce56a68eaa5fe36abd18a53b3c6a Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 11 Mar 2025 17:35:04 +0100 Subject: [PATCH 13/59] Adjust window size on small devices --- sbapp/main.py | 24 ++++++++++++++++++++---- setup.py | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 15f136b..ba65c34 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -25,8 +25,8 @@ import base64 import threading import RNS.vendor.umsgpack as msgpack -WINDOW_DEFAULT_WIDTH = "494" -WINDOW_DEFAULT_HEIGHT = "800" +WINDOW_DEFAULT_WIDTH = 494 +WINDOW_DEFAULT_HEIGHT = 800 app_ui_scaling_path = None def apply_ui_scale(): @@ -176,9 +176,25 @@ if not args.daemon: sys.path.append(local) if not RNS.vendor.platformutils.is_android(): + model = None + max_width = WINDOW_DEFAULT_WIDTH + max_height = WINDOW_DEFAULT_HEIGHT + + try: + if os.path.isfile("/sys/firmware/devicetree/base/model"): + with open("/sys/firmware/devicetree/base/model", "r") as mf: + model = mf.read() + except: pass + + if model: + if model.startswith("Raspberry Pi "): max_height = 625 + + window_width = min(WINDOW_DEFAULT_WIDTH, max_width) + window_height = min(WINDOW_DEFAULT_HEIGHT, max_height) + from kivy.config import Config - Config.set("graphics", "width", WINDOW_DEFAULT_WIDTH) - Config.set("graphics", "height", WINDOW_DEFAULT_HEIGHT) + Config.set("graphics", "width", str(window_width)) + Config.set("graphics", "height", str(window_height)) if args.daemon: from .sideband.core import SidebandCore diff --git a/setup.py b/setup.py index 8d4fea9..2dfcbba 100644 --- a/setup.py +++ b/setup.py @@ -123,7 +123,7 @@ setuptools.setup( "ffpyplayer", "sh", "numpy<=1.26.4", - "lxst>=0.2.2", + "lxst>=0.2.4", "mistune>=3.0.2", "beautifulsoup4", "pycodec2;sys.platform!='Windows' and sys.platform!='win32' and sys.platform!='darwin'", From 5e749bc0c3fd1af9da0c4ad4fcb0df3ab07d3273 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 11 Mar 2025 17:38:42 +0100 Subject: [PATCH 14/59] Fixed voice dialog not being dismissed --- sbapp/ui/conversations.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sbapp/ui/conversations.py b/sbapp/ui/conversations.py index d677c73..ac263a5 100644 --- a/sbapp/ui/conversations.py +++ b/sbapp/ui/conversations.py @@ -292,7 +292,7 @@ class Conversations(): yes_button.bind(on_release=dl_yes) no_button.bind(on_release=dl_no) - item.dmenu.dismiss() + self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss() dialog.open() RNS.log("Generated edit dialog in "+str(RNS.prettytime(time.time()-t_s)), RNS.LOG_DEBUG) @@ -321,7 +321,7 @@ class Conversations(): yes_button.bind(on_release=dl_yes) no_button.bind(on_release=dl_no) - item.dmenu.dismiss() + self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss() self.clear_dialog.open() return x @@ -345,7 +345,7 @@ class Conversations(): yes_button.bind(on_release=dl_yes) no_button.bind(on_release=dl_no) - item.dmenu.dismiss() + self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss() self.clear_telemetry_dialog.open() return x @@ -371,15 +371,14 @@ class Conversations(): yes_button.bind(on_release=dl_yes) no_button.bind(on_release=dl_no) - item.dmenu.dismiss() + self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss() self.delete_dialog.open() return x def gen_copy_addr(item): def x(): Clipboard.copy(RNS.hexrep(self.conversation_dropdown.context_dest, delimit=False)) - self.voice_dropdown.dismiss() - self.conversation_dropdown.dismiss() + self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss() return x def gen_call(item): @@ -387,7 +386,7 @@ class Conversations(): identity = RNS.Identity.recall(self.conversation_dropdown.context_dest) if identity: self.app.dial_action(identity.hash) else: toast("Can't call, identity unknown") - item.dmenu.dismiss() + self.voice_dropdown.dismiss(); self.conversation_dropdown.dismiss() return x item.iconr = IconRightWidget(icon="dots-vertical"); From 86e68f0dba0de71b4e19db43bd93cd8db582059f Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Wed, 12 Mar 2025 10:52:05 +0100 Subject: [PATCH 15/59] Fixed key mapping --- sbapp/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index ba65c34..c157d92 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1289,13 +1289,13 @@ class SidebandApp(MDApp): self.messages_view.ids.message_text.write_tab = True Clock.schedule_once(tab_job, 0.15) - elif self.rec_dialog != None and self.rec_dialog_is_open: + elif len(modifiers) == 0 and self.rec_dialog != None and self.rec_dialog_is_open: if text == " ": self.msg_rec_a_rec(None) elif keycode == 40: self.msg_rec_a_save(None) - elif not self.rec_dialog_is_open and not self.messages_view.ids.message_text.focus and self.messages_view.ptt_enabled and keycode == 44: + elif len(modifiers) == 0 and not self.rec_dialog_is_open and not self.messages_view.ids.message_text.focus and self.messages_view.ptt_enabled and keycode == 44: if not self.key_ptt_down: self.key_ptt_down = True self.message_ptt_down_action() From 3d7e894a9d9fca71b9423e389d01698d13115327 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 11:21:43 +0100 Subject: [PATCH 16/59] Updated dependencies --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 2dfcbba..83d4476 100644 --- a/setup.py +++ b/setup.py @@ -114,8 +114,8 @@ setuptools.setup( ] }, install_requires=[ - "rns>=0.9.2", - "lxmf>=0.6.0", + "rns>=0.9.3", + "lxmf>=0.6.2", "kivy>=2.3.0", "pillow>=10.2.0", "qrcode", From 4d9bba3e4cb2ab2a6746c6f2c70eed0788fc324e Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 14:09:38 +0100 Subject: [PATCH 17/59] Added audio device config ui --- sbapp/Makefile | 1 + sbapp/main.py | 3 + sbapp/sideband/core.py | 19 ++-- sbapp/sideband/voice.py | 24 ++++- sbapp/ui/utilities.py | 4 +- sbapp/ui/voice.py | 218 ++++++++++++++++++++++++++++++++++++++-- setup.py | 2 +- 7 files changed, 250 insertions(+), 21 deletions(-) diff --git a/sbapp/Makefile b/sbapp/Makefile index d0f9028..11bdb19 100644 --- a/sbapp/Makefile +++ b/sbapp/Makefile @@ -104,3 +104,4 @@ getrns: cleanrns: -(rm ./RNS -r) -(rm ./LXMF -r) + -(rm ./LXST -r) diff --git a/sbapp/main.py b/sbapp/main.py index c157d92..d9e3390 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1457,6 +1457,8 @@ class SidebandApp(MDApp): self.close_sub_utilities_action() elif self.root.ids.screen_manager.current == "logviewer_screen": self.close_sub_utilities_action() + elif self.root.ids.screen_manager.current == "voice_settings_screen": + self.close_sub_voice_action() else: self.open_conversations(direction="right") @@ -1534,6 +1536,7 @@ class SidebandApp(MDApp): def announce_now_action(self, sender=None): self.sideband.lxmf_announce() + if self.sideband.telephone: self.sideband.telephone.announce() yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18)) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 168cb7c..56f5249 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -535,6 +535,9 @@ class SidebandCore(): # Voice self.config["voice_enabled"] = False + self.config["voice_output"] = None + self.config["voice_input"] = None + self.config["voice_ringer"] = None if not os.path.isfile(self.db_path): self.__db_init() @@ -844,6 +847,12 @@ class SidebandCore(): if not "voice_enabled" in self.config: self.config["voice_enabled"] = False + if not "voice_output" in self.config: + self.config["voice_output"] = None + if not "voice_input" in self.config: + self.config["voice_input"] = None + if not "voice_ringer" in self.config: + self.config["voice_ringer"] = None # Make sure we have a database if not os.path.isfile(self.db_path): @@ -1233,11 +1242,6 @@ class SidebandCore(): lxmf_destination_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", identity_hash) existing_voice = self._db_conversation(context_dest) existing_lxmf = self._db_conversation(lxmf_destination_hash) - - print(RNS.prettyhexrep(lxmf_destination_hash)) - print(f"VOICE {existing_voice}") - print(f"LXMF {existing_lxmf}") - if existing_lxmf: return self.peer_display_name(lxmf_destination_hash) else: return self.peer_display_name(identity_hash) @@ -3458,6 +3462,7 @@ class SidebandCore(): if self.config["start_announce"] == True: time.sleep(12) self.lxmf_announce(attached_interface=self.interface_local) + if self.telephone: self.telephone.announce(attached_interface=self.interface_local) threading.Thread(target=job, daemon=True).start() if hasattr(self, "interface_rnode") and self.interface_rnode != None: @@ -3545,6 +3550,7 @@ class SidebandCore(): aif = announce_attached_interface time.sleep(delay) self.lxmf_announce(attached_interface=aif) + if self.telephone: self.telephone.announce(attached_interface=aif) return x threading.Thread(target=gen_announce_job(announce_delay, announce_attached_interface), daemon=True).start() @@ -3759,6 +3765,7 @@ class SidebandCore(): def da(): time.sleep(8) self.lxmf_announce() + if self.telephone: self.telephone.announce() self.last_if_change_announce = time.time() threading.Thread(target=da, daemon=True).start() @@ -5241,7 +5248,7 @@ class SidebandCore(): RNS.log("Starting voice service", RNS.LOG_DEBUG) self.voice_running = True from .voice import ReticulumTelephone - self.telephone = ReticulumTelephone(self.identity, owner=self) + self.telephone = ReticulumTelephone(self.identity, owner=self, speaker=self.config["voice_output"], microphone=self.config["voice_input"], ringer=self.config["voice_ringer"]) ringtone_path = os.path.join(self.asset_dir, "audio", "notifications", "soft1.opus") self.telephone.set_ringtone(ringtone_path) diff --git a/sbapp/sideband/voice.py b/sbapp/sideband/voice.py index 3754fc1..9222c10 100644 --- a/sbapp/sideband/voice.py +++ b/sbapp/sideband/voice.py @@ -22,7 +22,7 @@ class ReticulumTelephone(): WAIT_TIME = 60 PATH_TIME = 10 - def __init__(self, identity, owner = None, service = False): + def __init__(self, identity, owner = None, service = False, speaker=None, microphone=None, ringer=None): self.identity = identity self.service = service self.owner = owner @@ -37,9 +37,9 @@ class ReticulumTelephone(): self.last_input = None self.first_run = False self.ringtone_path = None - self.speaker_device = None - self.microphone_device = None - self.ringer_device = None + self.speaker_device = speaker + self.microphone_device = microphone + self.ringer_device = ringer self.phonebook = {} self.aliases = {} self.names = {} @@ -58,6 +58,21 @@ class ReticulumTelephone(): self.ringtone_path = ringtone_path self.telephone.set_ringtone(self.ringtone_path) + def set_speaker(self, device): + self.speaker_device = device + self.telephone.set_speaker(self.speaker_device) + + def set_microphone(self, device): + self.microphone_device = device + self.telephone.set_microphone(self.microphone_device) + + def set_ringer(self, device): + self.ringer_device = device + self.telephone.set_ringer(self.ringer_device) + + def announce(self, attached_interface=None): + self.telephone.announce(attached_interface=attached_interface) + @property def is_available(self): return self.state == self.STATE_AVAILABLE @@ -84,7 +99,6 @@ class ReticulumTelephone(): def start(self): if not self.should_run: - self.telephone.announce() self.should_run = True self.run() diff --git a/sbapp/ui/utilities.py b/sbapp/ui/utilities.py index bf46914..d3adcc7 100644 --- a/sbapp/ui/utilities.py +++ b/sbapp/ui/utilities.py @@ -40,7 +40,7 @@ class Utilities(): self.screen.delegate = self self.app.root.ids.screen_manager.add_widget(self.screen) - self.screen.ids.telemetry_scrollview.effect_cls = ScrollEffect + self.screen.ids.utilities_scrollview.effect_cls = ScrollEffect info = "This section contains various utilities and diagnostics tools, " info += "that can be helpful while using Sideband and Reticulum." @@ -220,7 +220,7 @@ MDScreen: ] ScrollView: - id: telemetry_scrollview + id: utilities_scrollview MDBoxLayout: orientation: "vertical" diff --git a/sbapp/ui/voice.py b/sbapp/ui/voice.py index fa00ea0..68e13d0 100644 --- a/sbapp/ui/voice.py +++ b/sbapp/ui/voice.py @@ -10,6 +10,7 @@ from kivymd.uix.recycleview import MDRecycleView from kivymd.uix.list import OneLineIconListItem from kivymd.uix.pickers import MDColorPicker from kivymd.uix.button import MDRectangleFlatButton +from kivymd.uix.button import MDRectangleFlatIconButton from kivymd.uix.dialog import MDDialog from kivymd.icon_definitions import md_icons from kivymd.toast import toast @@ -34,6 +35,11 @@ class Voice(): self.dial_target = None self.ui_updater = None self.path_requesting = None + self.output_devices = [] + self.input_devices = [] + self.listed_output_devices = [] + self.listed_input_devices = [] + self.listed_ringer_devices = [] if not self.app.root.ids.screen_manager.has_screen("voice_screen"): self.screen = Builder.load_string(layout_voice_screen) @@ -42,13 +48,6 @@ class Voice(): self.app.root.ids.screen_manager.add_widget(self.screen) self.screen.ids.voice_scrollview.effect_cls = ScrollEffect - # info = "Voice services UI" - # info += "" - - # if self.app.theme_cls.theme_style == "Dark": - # info = "[color=#"+self.app.dark_theme_text_color+"]"+info+"[/color]" - - # self.screen.ids.voice_info.text = info def update_call_status(self, dt=None): if self.app.root.ids.screen_manager.current == "voice_screen": @@ -170,6 +169,120 @@ class Voice(): self.app.sideband.telephone.answer() self.update_call_status() + + ### settings screen + ###################################### + + def settings_action(self, sender=None): + if not self.app.root.ids.screen_manager.has_screen("voice_settings_screen"): + self.voice_settings_screen = Builder.load_string(layout_voice_settings_screen) + self.voice_settings_screen.app = self.app + self.voice_settings_screen.delegate = self + self.app.root.ids.screen_manager.add_widget(self.voice_settings_screen) + + self.app.root.ids.screen_manager.transition.direction = "left" + self.app.root.ids.screen_manager.current = "voice_settings_screen" + self.voice_settings_screen.ids.voice_settings_scrollview.effect_cls = ScrollEffect + self.app.sideband.setstate("app.displaying", self.app.root.ids.screen_manager.current) + + self.update_settings_screen() + + def update_devices(self): + import LXST + self.output_devices = []; self.input_devices = [] + for device in LXST.Sources.Backend().soundcard.all_speakers(): self.output_devices.append(device.name) + for device in LXST.Sinks.Backend().soundcard.all_microphones(): self.input_devices.append(device.name) + if self.app.sideband.config["voice_output"] != None: + if not self.app.sideband.config["voice_output"] in self.output_devices: self.output_devices.append(self.app.sideband.config["voice_output"]) + if self.app.sideband.config["voice_input"] != None: + if not self.app.sideband.config["voice_input"] in self.input_devices: self.input_devices.append(self.app.sideband.config["voice_input"]) + if self.app.sideband.config["voice_ringer"] != None: + if not self.app.sideband.config["voice_ringer"] in self.output_devices: self.output_devices.append(self.app.sideband.config["voice_ringer"]) + + def update_settings_screen(self, sender=None): + bp = 6; ml = 45; fs = 16; ics = 14 + self.update_devices() + + # Output devices + if not "system_default" in self.listed_output_devices: + default_output_button = MDRectangleFlatIconButton(text="System Default", font_size=dp(fs), icon_size=dp(ics), on_release=self.output_device_action) + default_output_button.device = None; default_output_button.size_hint = [1.0, None] + if self.app.sideband.config["voice_output"] == None: default_output_button.icon = "check" + self.voice_settings_screen.ids.output_devices.add_widget(default_output_button) + self.listed_output_devices.append("system_default") + + for device in self.output_devices: + if not device in self.listed_output_devices: + label = device if len(device) < ml else device[:ml-3]+"..." + device_button = MDRectangleFlatIconButton(text=label, font_size=dp(fs), icon_size=dp(ics), on_release=self.output_device_action) + device_button.padding = [dp(bp), dp(bp), dp(bp), dp(bp)]; device_button.size_hint = [1.0, None] + if self.app.sideband.config["voice_output"] == device: device_button.icon = "check" + device_button.device = device + self.voice_settings_screen.ids.output_devices.add_widget(device_button) + self.listed_output_devices.append(device) + + # Input devices + if not "system_default" in self.listed_input_devices: + default_input_button = MDRectangleFlatIconButton(text="System Default", font_size=dp(fs), icon_size=dp(ics), on_release=self.input_device_action) + default_input_button.device = None; default_input_button.size_hint = [1.0, None] + if self.app.sideband.config["voice_output"] == None: default_input_button.icon = "check" + self.voice_settings_screen.ids.input_devices.add_widget(default_input_button) + self.listed_input_devices.append("system_default") + + for device in self.input_devices: + if not device in self.listed_input_devices: + label = device if len(device) < ml else device[:ml-3]+"..." + device_button = MDRectangleFlatIconButton(text=label, font_size=dp(fs), icon_size=dp(ics), on_release=self.input_device_action) + device_button.padding = [dp(bp), dp(bp), dp(bp), dp(bp)]; device_button.size_hint = [1.0, None] + if self.app.sideband.config["voice_input"] == device: device_button.icon = "check" + device_button.device = device + self.voice_settings_screen.ids.input_devices.add_widget(device_button) + self.listed_input_devices.append(device) + + # Ringer devices + if not "system_default" in self.listed_ringer_devices: + default_ringer_button = MDRectangleFlatIconButton(text="System Default", font_size=dp(fs), icon_size=dp(ics), on_release=self.ringer_device_action) + default_ringer_button.device = None; default_ringer_button.size_hint = [1.0, None] + if self.app.sideband.config["voice_ringer"] == None: default_ringer_button.icon = "check" + self.voice_settings_screen.ids.ringer_devices.add_widget(default_ringer_button) + self.listed_ringer_devices.append("system_default") + + for device in self.output_devices: + if not device in self.listed_ringer_devices: + label = device if len(device) < ml else device[:ml-3]+"..." + device_button = MDRectangleFlatIconButton(text=label, font_size=dp(fs), icon_size=dp(ics), on_release=self.ringer_device_action) + device_button.padding = [dp(bp), dp(bp), dp(bp), dp(bp)]; device_button.size_hint = [1.0, None] + if self.app.sideband.config["voice_ringer"] == device: device_button.icon = "check" + device_button.device = device + self.voice_settings_screen.ids.ringer_devices.add_widget(device_button) + self.listed_ringer_devices.append(device) + + + def output_device_action(self, sender=None): + self.app.sideband.config["voice_output"] = sender.device + self.app.sideband.save_configuration() + for w in self.voice_settings_screen.ids.output_devices.children: w.icon = "" + sender.icon = "check" + if self.app.sideband.telephone: + self.app.sideband.telephone.set_speaker(self.app.sideband.config["voice_output"]) + + def input_device_action(self, sender=None): + self.app.sideband.config["voice_input"] = sender.device + self.app.sideband.save_configuration() + for w in self.voice_settings_screen.ids.input_devices.children: w.icon = "" + sender.icon = "check" + if self.app.sideband.telephone: + self.app.sideband.telephone.set_microphone(self.app.sideband.config["voice_input"]) + + def ringer_device_action(self, sender=None): + self.app.sideband.config["voice_ringer"] = sender.device + self.app.sideband.save_configuration() + for w in self.voice_settings_screen.ids.ringer_devices.children: w.icon = "" + sender.icon = "check" + if self.app.sideband.telephone: + self.app.sideband.telephone.set_ringer(self.app.sideband.config["voice_ringer"]) + + layout_voice_screen = """ MDScreen: name: "voice_screen" @@ -185,6 +298,7 @@ MDScreen: [['menu', lambda x: root.app.nav_drawer.set_state("open")]] right_action_items: [ + ['wrench-cog', lambda x: root.delegate.settings_action(self)], ['close', lambda x: root.app.close_any_action(self)], ] @@ -231,3 +345,93 @@ MDScreen: on_release: root.delegate.dial_action(self) disabled: True """ + +layout_voice_settings_screen = """ +MDScreen: + name: "voice_settings_screen" + + BoxLayout: + orientation: "vertical" + + MDTopAppBar: + id: top_bar + title: "Voice Configuration" + anchor_title: "left" + elevation: 0 + left_action_items: + [['menu', lambda x: root.app.nav_drawer.set_state("open")]] + right_action_items: + [ + ['close', lambda x: root.app.close_sub_voice_action(self)], + ] + + MDScrollView: + id: voice_settings_scrollview + size_hint_x: 1 + size_hint_y: None + size: [root.width, root.height-root.ids.top_bar.height] + do_scroll_x: False + do_scroll_y: True + + MDBoxLayout: + orientation: "vertical" + size_hint_y: None + height: self.minimum_height + padding: [dp(28), dp(32), dp(28), dp(16)] + + MDLabel: + id: voice_settings_info + markup: True + text: "You can configure which audio devices Sideband will use for voice calls, by selecting either the system default device, or specific audio devices available." + size_hint_y: None + text_size: self.width, None + height: self.texture_size[1] + padding: [dp(0), dp(0), dp(0), dp(48)] + + MDLabel: + text: "Output Device" + font_style: "H6" + + MDBoxLayout: + id: output_devices + orientation: "vertical" + spacing: "12dp" + size_hint_y: None + height: self.minimum_height + padding: [dp(0), dp(35), dp(0), dp(48)] + + # MDRectangleFlatIconButton: + # id: output_default_button + # text: "System Default" + # padding: [dp(0), dp(14), dp(0), dp(14)] + # icon_size: dp(24) + # font_size: dp(16) + # size_hint: [1.0, None] + # on_release: root.delegate.output_device_action(self) + # disabled: False + + MDLabel: + text: "Input Device" + font_style: "H6" + + MDBoxLayout: + id: input_devices + orientation: "vertical" + spacing: "12dp" + size_hint_y: None + height: self.minimum_height + padding: [dp(0), dp(35), dp(0), dp(48)] + + MDLabel: + text: "Ringer Device" + font_style: "H6" + + MDBoxLayout: + id: ringer_devices + orientation: "vertical" + spacing: "12dp" + size_hint_y: None + height: self.minimum_height + padding: [dp(0), dp(35), dp(0), dp(48)] + +""" \ No newline at end of file diff --git a/setup.py b/setup.py index 83d4476..604c0c1 100644 --- a/setup.py +++ b/setup.py @@ -123,7 +123,7 @@ setuptools.setup( "ffpyplayer", "sh", "numpy<=1.26.4", - "lxst>=0.2.4", + "lxst>=0.2.7", "mistune>=3.0.2", "beautifulsoup4", "pycodec2;sys.platform!='Windows' and sys.platform!='win32' and sys.platform!='darwin'", From dd12a76bf998255a815282d655f7e76cb2fd3b27 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 15:05:51 +0100 Subject: [PATCH 18/59] Added option to block non-trusted callers --- sbapp/sideband/core.py | 16 ++++++++++ sbapp/sideband/voice.py | 6 ++++ sbapp/ui/voice.py | 66 ++++++++++++++++++++++++++++++++++------- 3 files changed, 77 insertions(+), 11 deletions(-) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 56f5249..e758455 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -853,6 +853,8 @@ class SidebandCore(): self.config["voice_input"] = None if not "voice_ringer" in self.config: self.config["voice_ringer"] = None + if not "voice_trusted_only" in self.config: + self.config["voice_trusted_only"] = False # Make sure we have a database if not os.path.isfile(self.db_path): @@ -1074,6 +1076,20 @@ class SidebandCore(): RNS.log("Error while checking trust for "+RNS.prettyhexrep(context_dest)+": "+str(e), RNS.LOG_ERROR) return False + def voice_is_trusted(self, identity_hash): + context_dest = identity_hash + try: + lxmf_destination_hash = RNS.Destination.hash_from_name_and_identity("lxmf.delivery", identity_hash) + existing_voice = self._db_conversation(context_dest) + existing_lxmf = self._db_conversation(lxmf_destination_hash) + if existing_lxmf: trust = existing_lxmf["trust"] + else: trust = existing_voice["trust"] + return trust == 1 + + except Exception as e: + RNS.log("Could not decode a valid peer name from data: "+str(e), RNS.LOG_DEBUG) + return False + def is_object(self, context_dest, conv_data = None): try: if conv_data == None: diff --git a/sbapp/sideband/voice.py b/sbapp/sideband/voice.py index 9222c10..67a91ca 100644 --- a/sbapp/sideband/voice.py +++ b/sbapp/sideband/voice.py @@ -51,6 +51,7 @@ class ReticulumTelephone(): self.telephone.set_speaker(self.speaker_device) self.telephone.set_microphone(self.microphone_device) self.telephone.set_ringer(self.ringer_device) + self.telephone.set_allowed(self.__is_allowed) RNS.log(f"{self} initialised", RNS.LOG_DEBUG) def set_ringtone(self, ringtone_path): @@ -155,6 +156,11 @@ class ReticulumTelephone(): self.state = self.STATE_IN_CALL RNS.log(f"Call established with {RNS.prettyhexrep(self.caller.hash)}", RNS.LOG_DEBUG) + def __is_allowed(self, identity_hash): + if self.owner.config["voice_trusted_only"]: + return self.owner.voice_is_trusted(identity_hash) + else: return True + def __spin(self, until=None, msg=None, timeout=None): if msg: RNS.log(msg, RNS.LOG_DEBUG) if timeout != None: timeout = time.time()+timeout diff --git a/sbapp/ui/voice.py b/sbapp/ui/voice.py index 68e13d0..60d19fd 100644 --- a/sbapp/ui/voice.py +++ b/sbapp/ui/voice.py @@ -200,6 +200,9 @@ class Voice(): if not self.app.sideband.config["voice_ringer"] in self.output_devices: self.output_devices.append(self.app.sideband.config["voice_ringer"]) def update_settings_screen(self, sender=None): + self.voice_settings_screen.ids.voice_trusted_only.active = self.app.sideband.config["voice_trusted_only"] + self.voice_settings_screen.ids.voice_trusted_only.bind(active=self.settings_save_action) + bp = 6; ml = 45; fs = 16; ics = 14 self.update_devices() @@ -257,6 +260,9 @@ class Voice(): self.voice_settings_screen.ids.ringer_devices.add_widget(device_button) self.listed_ringer_devices.append(device) + def settings_save_action(self, sender=None, event=None): + self.app.sideband.config["voice_trusted_only"] = self.voice_settings_screen.ids.voice_trusted_only.active + self.app.sideband.save_configuration() def output_device_action(self, sender=None): self.app.sideband.config["voice_output"] = sender.device @@ -377,7 +383,42 @@ MDScreen: orientation: "vertical" size_hint_y: None height: self.minimum_height - padding: [dp(28), dp(32), dp(28), dp(16)] + padding: [dp(28), dp(48), dp(28), dp(16)] + + MDLabel: + text: "Call Handling" + font_style: "H6" + height: self.texture_size[1] + padding: [dp(0), dp(0), dp(0), dp(12)] + + MDLabel: + id: voice_settings_info + markup: True + text: "You can block calls from all other callers than contacts marked as trusted, by enabling the following option." + size_hint_y: None + text_size: self.width, None + height: self.texture_size[1] + padding: [dp(0), dp(16), dp(0), dp(16)] + + MDBoxLayout: + orientation: "horizontal" + padding: [0,0,dp(24),0] + size_hint_y: None + height: dp(48) + + MDLabel: + text: "Block non-trusted callers" + font_style: "H6" + + MDSwitch: + id: voice_trusted_only + pos_hint: {"center_y": 0.3} + active: False + + MDLabel: + text: "Audio Devices" + font_style: "H6" + padding: [dp(0), dp(96), dp(0), dp(12)] MDLabel: id: voice_settings_info @@ -386,11 +427,12 @@ MDScreen: size_hint_y: None text_size: self.width, None height: self.texture_size[1] - padding: [dp(0), dp(0), dp(0), dp(48)] + padding: [dp(0), dp(64), dp(0), dp(32)] MDLabel: - text: "Output Device" - font_style: "H6" + text: "[b]Output[/b]" + font_size: dp(18) + markup: True MDBoxLayout: id: output_devices @@ -398,7 +440,7 @@ MDScreen: spacing: "12dp" size_hint_y: None height: self.minimum_height - padding: [dp(0), dp(35), dp(0), dp(48)] + padding: [dp(0), dp(24), dp(0), dp(48)] # MDRectangleFlatIconButton: # id: output_default_button @@ -411,8 +453,9 @@ MDScreen: # disabled: False MDLabel: - text: "Input Device" - font_style: "H6" + text: "[b]Input[/b]" + font_size: dp(18) + markup: True MDBoxLayout: id: input_devices @@ -420,11 +463,12 @@ MDScreen: spacing: "12dp" size_hint_y: None height: self.minimum_height - padding: [dp(0), dp(35), dp(0), dp(48)] + padding: [dp(0), dp(24), dp(0), dp(48)] MDLabel: - text: "Ringer Device" - font_style: "H6" + text: "[b]Ringer[/b]" + font_size: dp(18) + markup: True MDBoxLayout: id: ringer_devices @@ -432,6 +476,6 @@ MDScreen: spacing: "12dp" size_hint_y: None height: self.minimum_height - padding: [dp(0), dp(35), dp(0), dp(48)] + padding: [dp(0), dp(24), dp(0), dp(48)] """ \ No newline at end of file From 999054ab3476d20f847e22e52b62e1d606667558 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 17:13:02 +0100 Subject: [PATCH 19/59] Improved map init time --- sbapp/main.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sbapp/main.py b/sbapp/main.py index d9e3390..827ce5c 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -6155,7 +6155,7 @@ class SidebandApp(MDApp): latest_viewable = None if not skip: - for telemetry_entry in telemetry_entries[telemetry_source]: + for telemetry_entry in sorted(telemetry_entries[telemetry_source], key=lambda t: t[0], reverse=True): telemetry_timestamp = telemetry_entry[0] telemetry_data = telemetry_entry[1] t = Telemeter.from_packed(telemetry_data) @@ -6164,6 +6164,10 @@ class SidebandApp(MDApp): if "location" in telemetry and telemetry["location"] != None and telemetry["location"]["latitude"] != None and telemetry["location"]["longitude"] != None: latest_viewable = telemetry break + elif "connection_map" in telemetry: + # TODO: Telemetry entries with connection map sensor types are skipped for now, + # until a proper rendering mechanism is implemented + break if latest_viewable != None: l = latest_viewable["location"] From 1c855aa24ba44be761aa865bbe01b9618b844e4c Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 17:20:49 +0100 Subject: [PATCH 20/59] Disable voice call option on Android --- sbapp/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sbapp/main.py b/sbapp/main.py index 827ce5c..37d1d3d 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -3383,6 +3383,7 @@ class SidebandApp(MDApp): self.settings_screen.ids.settings_voice_enabled.active = self.sideband.config["voice_enabled"] self.settings_screen.ids.settings_voice_enabled.bind(active=save_voice_enabled) + if RNS.vendor.platformutils.is_android(): self.settings_screen.ids.settings_voice_enabled.disabled = True self.settings_screen.ids.settings_debug.active = self.sideband.config["debug"] self.settings_screen.ids.settings_debug.bind(active=save_debug) From 7b2745692df4f8276e9b381794bb1c68857227b7 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 18:41:22 +0100 Subject: [PATCH 21/59] Updated build spec --- sideband.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sideband.spec b/sideband.spec index 67f1d3f..260aa4d 100644 --- a/sideband.spec +++ b/sideband.spec @@ -36,6 +36,7 @@ def extra_datas(mydir): a.datas += extra_datas('sbapp') a.datas += extra_datas('RNS') a.datas += extra_datas('LXMF') +a.datas += extra_datas('LXST') exe = EXE( pyz, From fdb4003a175d910911a2984f5eb11988ccb0f2e6 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 21:21:25 +0100 Subject: [PATCH 22/59] Updated readme --- README.md | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 557b655..9d05edc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Sideband ========= -Sideband is an extensible LXMF messaging client, situational awareness tracker and remote control and monitoring system for Android, Linux, macOS and Windows. It allows you to communicate with other people or LXMF-compatible systems over Reticulum networks using LoRa, Packet Radio, WiFi, I2P, Encrypted QR Paper Messages, or anything else Reticulum supports. +Sideband is an extensible LXMF messaging and LXST telephony client, situational awareness tracker and remote control and monitoring system for Android, Linux, macOS and Windows. It allows you to communicate with other people or LXMF-compatible systems over Reticulum networks using LoRa, Packet Radio, WiFi, I2P, Encrypted QR Paper Messages, or anything else Reticulum supports. ![Screenshot](https://github.com/markqvist/Sideband/raw/main/docs/screenshots/devices_small.webp) @@ -13,10 +13,11 @@ This also means that Sideband operates differently than what you might be used t Sideband provides many useful and interesting functions, such as: -- **Secure** and **self-sovereign** messaging using the LXMF protocol over Reticulum. +- **Secure** and **self-sovereign** messaging and voice calls using the LXMF and LXST protocols over Reticulum. - **Image** and **file transfers** over all supported mediums. - **Audio messages** that work even over **LoRa** and **radio links**, thanks to [Codec2](https://github.com/drowe67/codec2/) and [Opus](https://github.com/xiph/opus) encoding. - Secure and direct P2P **telemetry and location sharing**. No third parties or servers ever have your data. +- The telemetry system is **completely extensible** via [simple plugins](https://github.com/markqvist/Sideband/tree/main/docs/example_plugins). - Situation display on both online and **locally stored offline maps**. - Geospatial awareness calculations. - Exchanging messages through **encrypted QR-codes on paper**, or through messages embedded directly in **lxm://** links. @@ -39,7 +40,7 @@ Sideband can run on most computing devices, but installation methods vary by dev ## On Android -For your Android devices, you can install Sideband through F-Droid, by adding the [Between the Borders Repo](https://reticulum.betweentheborders.com/fdroid/repo/), or you can download an [APK on the latest release page](https://github.com/markqvist/Sideband/releases/latest). Both sources are signed with the same release keys, and can be used interchangably. +For your Android devices, you can download an [APK on the latest release page](https://github.com/markqvist/Sideband/releases/latest). After the application is installed on your Android device, it is also possible to pull updates directly through the **Repository** section of the application. @@ -47,9 +48,8 @@ After the application is installed on your Android device, it is also possible t On all Linux-based operating systems, Sideband is available as a `pipx`/`pip` package. This installation method **includes desktop integration**, so that Sideband will show up in your applications menu and launchers. Below are install steps for the most common recent Linux distros. For Debian 11, see the end of this section. -**Please note!** The very latest Python release, Python 3.13 is currently **not** compatible with the Kivy framework, that Sideband uses to render its user interface. If your Linux distribution uses Python 3.13 as its default Python installation, you will need to install an earlier version as well. Using [the latest release of Python 3.12](https://www.python.org/downloads/release/python-3127/) is recommended. - -You will first need to install a few dependencies for audio messaging and Codec2 support to work: +#### Basic Installation +You will first need to install a few dependencies for voice calls, audio messaging and Codec2 support to work: ```bash # For Debian (12+), Ubuntu (22.04+) and derivatives @@ -68,10 +68,6 @@ Once those are installed, install the Sideband application itself: ```bash # Finally, install Sideband using pipx: pipx install sbapp - -# If you need to specify a specific Python version, -# use something like the following: -pipx install sbapp --python python3.12 ``` After installation, you can now run Sideband in a number of different ways: @@ -101,6 +97,9 @@ sideband --daemon sideband -v ``` +If you do not already have Reticulum connectivity set up on your computer or local network, you will probably want to edit the Reticulum configuration file at `~/.reticulum/config` and [add any interfaces](https://reticulum.network/manual/interfaces.html) you need for connectivity. + +#### Advanced Installation You can also install Sideband in various alternative ways: ```bash @@ -135,17 +134,17 @@ You can install Sideband on all Raspberry Pi models that support 64-bit operatin Aditionally, the `pycodec2` package needs to be installed manually. I have provided a pre-built version, that you can download and install with a single command, or if you don't want to trust my pre-built version, you can [build and install it from source yourself](https://github.com/gregorias/pycodec2/blob/main/DEV.md). -The install instructions below assume that you are installing Sideband on 64-bit Raspberry Pi OS (based on Debian Bookworm). If you're running something else on your Pi, you might need to modify some commands slightly. To install Sideband on Raspberry Pi, follow these steps: +The install instructions below assume that you are installing Sideband on 64-bit Raspberry Pi OS (based on Debian Bookworm or later). If you're running something else on your Pi, you might need to modify some commands slightly. To install Sideband on Raspberry Pi with full support for voice calls, audio messages and Codec2, follow these steps: ```bash # First of all, install the required dependencies: sudo apt install python3-pip python3-pyaudio python3-dev python3-cryptography build-essential libopusfile0 libsdl2-dev libavcodec-dev libavdevice-dev libavfilter-dev portaudio19-dev codec2 libcodec2-1.0 xclip xsel # If you don't want to compile pycodec2 yourself, -# download the pre-compiled package provided here +# download the pre-compiled package provided here: wget https://raw.githubusercontent.com/markqvist/Sideband/main/docs/utilities/pycodec2-3.0.1-cp311-cp311-linux_aarch64.whl -# Install it: +# And install it: pip install ./pycodec2-3.0.1-cp311-cp311-linux_aarch64.whl --break-system-packages # You can now install Sideband @@ -159,6 +158,8 @@ sudo reboot sideband ``` +If you do not already have Reticulum connectivity set up on your computer or local network, you will probably want to edit the Reticulum configuration file at `~/.reticulum/config` and [add any interfaces](https://reticulum.network/manual/interfaces.html) you need for connectivity. + ## On macOS To install Sideband on macOS, you have two options available: @@ -185,6 +186,8 @@ pip3 install rns --break-system-packages If you do not have Python and `pip` available, [download and install it](https://www.python.org/downloads/) first. +If you do not already have Reticulum connectivity set up on your computer or local network, you will probably want to edit the Reticulum configuration file at `~/.reticulum/config` and [add any interfaces](https://reticulum.network/manual/interfaces.html) you need for connectivity. + #### Source Package Install For more advanced setups, including the ability to run Sideband in headless daemon mode, enable debug logging output, configuration import and export and more, you may want to install it from the source package via `pip` instead. @@ -238,6 +241,8 @@ Simply download the packaged Windows ZIP file from the [latest release page](htt When running Sideband for the first time, a default Reticulum configuration file will be created, if you don't already have one. If you don't have any existing Reticulum connectivity available locally, you may want to edit the file, located at `C:\Users\USERNAME\.reticulum\config` and manually add an interface that provides connectivity to a wider network. If you just want to connect over the Internet, you can add one of the public hubs on the [Reticulum Testnet](https://reticulum.network/connect.html). +#### Installing Reticulum Utilities + Though the ZIP file contains everything necessary to run Sideband, it is also recommended to install the Reticulum command line utilities separately, so that you can use commands like `rnstatus` and `rnsd` from the command line. This will make it easier to manage Reticulum connectivity on your system. If you do not already have Python installed on your system, [download and install it](https://www.python.org/downloads/) first. **Important!** When asked by the installer, make sure to add the Python program to your `PATH` environment variables. If you don't do this, you will not be able to use the `pip` installer, or run any of the installed commands. When Python has been installed, you can open a command prompt and install the Reticulum package via `pip`: @@ -262,6 +267,16 @@ The Sideband application can now be launched by running the command `sideband` i Since this installation method automatically installs the `rns` and `lxmf` packages as well, you will also have access to using all the included RNS and LXMF utilities like `rnstatus`, `rnsd` and `lxmd` on your system. +# Creating Plugins + +Sideband features a flexible and extensible plugin system, that allows you to hook all kinds of control, status reporting, command execution and telemetry collection into the LXMF messaging system. Plugins can be created as either *Telemetry*, *Command* or *Service* plugins, for different use-cases. + +To create plugins for Sideband, you can find a variety of [code examples](https://github.com/markqvist/Sideband/tree/main/docs/example_plugins), that you can use as a basis for writing your own plugins. Sideband includes 20+ built-in sensor types to chose from, for representing all kinds telemetry data. If none of those fit your needs, there is a `Custom` sensor type, that can include any kind of data. + +Command plugins allow you to define any kind of action or command to be run when receiving command messages from other LXMF clients. In the example directory, you will find various command plugin templates, for example for viewing security cameras or webcams through Sideband. + +Service plugins allow you to integrate any kind of service, bridge or other system into Sideband, and have that react to events or state changes in Sideband itself. + # Paper Messaging Example You can try out the paper messaging functionality by using the following QR-code. It is a paper message sent to the LXMF address `6b3362bd2c1dbf87b66a85f79a8d8c75`. To be able to decrypt and read the message, you will need to import the following base32-encoded Reticulum Identity into the app: From 45f5d3e9adb498105d60bdce9fe18136fa33c8fc Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 21:21:37 +0100 Subject: [PATCH 23/59] Added windows location plugin example --- docs/example_plugins/windows_location.py | 88 ++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 docs/example_plugins/windows_location.py diff --git a/docs/example_plugins/windows_location.py b/docs/example_plugins/windows_location.py new file mode 100644 index 0000000..ff0aded --- /dev/null +++ b/docs/example_plugins/windows_location.py @@ -0,0 +1,88 @@ +# Windows Location Provider plugin example, provided by @haplo-dev + +import RNS +import time +import threading +import asyncio +from winsdk.windows.devices import geolocation + +class WindowsLocationPlugin(SidebandTelemetryPlugin): + plugin_name = "windows_location" + + def __init__(self, sideband_core): + self.update_interval = 5.0 + self.should_run = False + + self.latitude = None + self.longitude = None + self.altitude = None + self.speed = None + self.bearing = None + self.accuracy = None + self.last_update = None + + super().__init__(sideband_core) + + def start(self): + RNS.log("Starting Windows Location provider plugin...") + + self.should_run = True + update_thread = threading.Thread(target=self.update_job, daemon=True) + update_thread.start() + + super().start() + + def stop(self): + self.should_run = False + super().stop() + + def update_job(self): + while self.should_run: + RNS.log("Updating location from Windows Geolocation...", RNS.LOG_DEBUG) + try: + asyncio.run(self.get_location()) + except Exception as e: + RNS.log(f"Error getting location: {str(e)}", RNS.LOG_ERROR) + + time.sleep(self.update_interval) + + async def get_location(self): + geolocator = geolocation.Geolocator() + position = await geolocator.get_geoposition_async() + + self.last_update = time.time() + self.latitude = position.coordinate.latitude + self.longitude = position.coordinate.longitude + self.altitude = position.coordinate.altitude + self.accuracy = position.coordinate.accuracy + + # Note: Windows Geolocation doesn't provide speed and bearing directly + # You might need to calculate these from successive position updates + self.speed = None + self.bearing = None + + def has_location(self): + return all([self.latitude, self.longitude, self.altitude, self.accuracy]) is not None + + def update_telemetry(self, telemeter): + if self.is_running() and telemeter is not None: + if self.has_location(): + RNS.log("Updating location from Windows Geolocation", RNS.LOG_DEBUG) + if "location" not in telemeter.sensors: + telemeter.synthesize("location") + + telemeter.sensors["location"].latitude = self.latitude + telemeter.sensors["location"].longitude = self.longitude + telemeter.sensors["location"].altitude = self.altitude + telemeter.sensors["location"].speed = self.speed + telemeter.sensors["location"].bearing = self.bearing + telemeter.sensors["location"].accuracy = self.accuracy + telemeter.sensors["location"].stale_time = 5 + telemeter.sensors["location"].set_update_time(self.last_update) + + else: + RNS.log("No location from Windows Geolocation yet", RNS.LOG_DEBUG) + +# Finally, tell Sideband what class in this +# file is the actual plugin class. +plugin_class = WindowsLocationPlugin \ No newline at end of file From ff8b1d4c28e414c48b937f561f88b9533e0bf750 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 21:23:16 +0100 Subject: [PATCH 24/59] Updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9d05edc..e1dd455 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Sideband provides many useful and interesting functions, such as: - **Image** and **file transfers** over all supported mediums. - **Audio messages** that work even over **LoRa** and **radio links**, thanks to [Codec2](https://github.com/drowe67/codec2/) and [Opus](https://github.com/xiph/opus) encoding. - Secure and direct P2P **telemetry and location sharing**. No third parties or servers ever have your data. -- The telemetry system is **completely extensible** via [simple plugins](https://github.com/markqvist/Sideband/tree/main/docs/example_plugins). +- The telemetry system is **completely extensible** via [simple plugins](#creating-plugins). - Situation display on both online and **locally stored offline maps**. - Geospatial awareness calculations. - Exchanging messages through **encrypted QR-codes on paper**, or through messages embedded directly in **lxm://** links. From 41536eb25a4386eae22f96fca3f4fd4cd01d0613 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 21:30:21 +0100 Subject: [PATCH 25/59] Updated readme --- README.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e1dd455..520f87f 100644 --- a/README.md +++ b/README.md @@ -271,7 +271,19 @@ Since this installation method automatically installs the `rns` and `lxmf` packa Sideband features a flexible and extensible plugin system, that allows you to hook all kinds of control, status reporting, command execution and telemetry collection into the LXMF messaging system. Plugins can be created as either *Telemetry*, *Command* or *Service* plugins, for different use-cases. -To create plugins for Sideband, you can find a variety of [code examples](https://github.com/markqvist/Sideband/tree/main/docs/example_plugins), that you can use as a basis for writing your own plugins. Sideband includes 20+ built-in sensor types to chose from, for representing all kinds telemetry data. If none of those fit your needs, there is a `Custom` sensor type, that can include any kind of data. +To create plugins for Sideband, you can find a variety of [code examples](https://github.com/markqvist/Sideband/tree/main/docs/example_plugins) in this repository, that you can use as a basis for writing your own plugins. The example plugins include: + +- [Custom telemetry](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/telemetry.py) +- [Getting BME280 temperature, humidity and pressure](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/bme280_telemetry.py) +- [Basic commands](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/basic.py) +- [Location telemetry from GPSd on Linux](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/gpsd_location.py) +- [Location telemetry from Windows Location Provider](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/windows_location.py) +- [Getting statistics from your LXMF propagation node](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/lxmd_telemetry.py) +- [Viewing cameras and streams](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/view.py) +- [Fetching an XKCD comic](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/comic.py) +- [Creating a service plugin](https://github.com/markqvist/Sideband/blob/main/docs/example_plugins/service.py) + +For creating telemetry plugins, Sideband includes 20+ built-in sensor types to chose from, for representing all kinds telemetry data. If none of those fit your needs, there is a `Custom` sensor type, that can include any kind of data. Command plugins allow you to define any kind of action or command to be run when receiving command messages from other LXMF clients. In the example directory, you will find various command plugin templates, for example for viewing security cameras or webcams through Sideband. From e4bb1e17eb6280dd8b2db85a8d0981f515bb0988 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 21:31:59 +0100 Subject: [PATCH 26/59] Updated readme --- README.md | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/README.md b/README.md index 520f87f..b46828a 100644 --- a/README.md +++ b/README.md @@ -324,26 +324,6 @@ You can help support the continued development of open, free and private communi
-# Planned Features - -- Secure and private location and telemetry sharing -- Including images in messages -- Sending file attachments -- Offline and online maps -- Paper messages -- Using Sideband as a Reticulum Transport Instance -- Encryption keys export and import -- Plugin support for commands, services and telemetry -- Sending voice messages (using Codec2 and Opus) -- Adding a Linux desktop integration -- Adding prebuilt Windows binaries to the releases -- Adding prebuilt macOS binaries to the releases -- A debug log viewer -- Adding a Nomad Net page browser -- LXMF sneakernet functionality -- Network visualisation and test tools -- Better message sorting mechanism - # License Unless otherwise noted, this work is licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License][cc-by-nc-sa]. From f6d23257850d246e3a60edd19f401ecbc61cb9ee Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 21:51:13 +0100 Subject: [PATCH 27/59] Updated readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b46828a..2f07d59 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,10 @@ After installation, you can now run Sideband in a number of different ways: pipx ensurepath # The first time you run Sideband, you will need to do it -# from the terminal: +# from the terminal, for the application launcher item to +# show up. On some distros you may also need to log out +# and back in again, or simply reboot the machine for the +# application entry to show up in your menu. sideband # At the first launch, it will add an application icon From b2c3411c90225dd8eb31db37c2ede440363827df Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 14 Mar 2025 21:51:24 +0100 Subject: [PATCH 28/59] Fixed missing property init --- sbapp/sideband/core.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index e758455..2491e02 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -169,6 +169,7 @@ class SidebandCore(): self.reticulum = None self.webshare_server = None self.voice_running = False + self.telephone = None self.telemeter = None self.telemetry_running = False self.latest_telemetry = None From a0a6b0fd552d807cd17a8817c02ff0810d805a69 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 27 Mar 2025 22:16:54 +0100 Subject: [PATCH 29/59] Handle MQTT client memory leak --- sbapp/sideband/core.py | 38 +++++++++++++++++++++++++++++++++----- sbapp/sideband/mqtt.py | 3 +++ 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 2491e02..161854e 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -8,6 +8,7 @@ import sqlite3 import random import shlex import re +import gc import RNS.vendor.umsgpack as msgpack import RNS.Interfaces.Interface as Interface @@ -268,6 +269,7 @@ class SidebandCore(): self.webshare_ssl_cert_path = self.app_dir+"/app_storage/ssl_cert.pem" self.mqtt = None + self.mqtt_handle_lock = threading.Lock() self.first_run = True self.saving_configuration = False @@ -2141,6 +2143,7 @@ class SidebandCore(): dbc = db.cursor() dbc.execute("CREATE TABLE IF NOT EXISTS telemetry (id INTEGER PRIMARY KEY, dest_context BLOB, ts INTEGER, data BLOB)") + dbc.execute("CREATE INDEX IF NOT EXISTS idx_telemetry_ts ON telemetry(ts)") db.commit() def _db_upgradetables(self): @@ -3269,12 +3272,37 @@ class SidebandCore(): self.setstate("app.flags.last_telemetry", time.time()) def mqtt_handle_telemetry(self, context_dest, telemetry): - if self.mqtt == None: - self.mqtt = MQTT() + with self.mqtt_handle_lock: + # TODO: Remove debug + if hasattr(self, "last_mqtt_recycle") and time.time() > self.last_mqtt_recycle + 60*4: + # RNS.log("Recycling MQTT handler", RNS.LOG_DEBUG) + self.mqtt.stop() + self.mqtt.client = None + self.mqtt = None + gc.collect() - self.mqtt.set_server(self.config["telemetry_mqtt_host"], self.config["telemetry_mqtt_port"]) - self.mqtt.set_auth(self.config["telemetry_mqtt_user"], self.config["telemetry_mqtt_pass"]) - self.mqtt.handle(context_dest, telemetry) + if self.mqtt == None: + self.mqtt = MQTT() + self.last_mqtt_recycle = time.time() + + self.mqtt.set_server(self.config["telemetry_mqtt_host"], self.config["telemetry_mqtt_port"]) + self.mqtt.set_auth(self.config["telemetry_mqtt_user"], self.config["telemetry_mqtt_pass"]) + self.mqtt.handle(context_dest, telemetry) + + # TODO: Remove debug + # if not hasattr(self, "memtr"): + # from pympler import muppy + # from pympler import summary + # import resource + # self.res = resource + # self.ms = summary; self.mp = muppy + # self.memtr = self.ms.summarize(self.mp.get_objects()) + # RNS.log(f"RSS: {RNS.prettysize(self.res.getrusage(self.res.RUSAGE_SELF).ru_maxrss*1000)}") + # else: + # memsum = self.ms.summarize(self.mp.get_objects()) + # memdiff = self.ms.get_diff(self.memtr, memsum) + # self.ms.print_(memdiff) + # RNS.log(f"RSS: {RNS.prettysize(self.res.getrusage(self.res.RUSAGE_SELF).ru_maxrss*1000)}") def update_telemetry(self): try: diff --git a/sbapp/sideband/mqtt.py b/sbapp/sideband/mqtt.py index bed0e6d..df55388 100644 --- a/sbapp/sideband/mqtt.py +++ b/sbapp/sideband/mqtt.py @@ -49,6 +49,9 @@ class MQTT(): time.sleep(MQTT.SCHEDULER_SLEEP) + try: self.disconnect() + except Exception as e: RNS.log(f"An error occurred while disconnecting MQTT server: {e}", RNS.LOG_ERROR) + RNS.log("Stopped MQTT scheduler", RNS.LOG_DEBUG) def connect_failed(self, client, userdata): From 1054ddf1c414b5bdbab288b2a2bc885f9e6e0b9e Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 27 Mar 2025 22:20:51 +0100 Subject: [PATCH 30/59] Updated build spec --- sbapp/buildozer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbapp/buildozer.spec b/sbapp/buildozer.spec index b6b8594..f970683 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 = 20250220 +android.numeric_version = 20250327 requirements = kivy==2.3.0,libbz2,pillow==10.2.0,qrcode==7.3.1,usb4a,usbserial4a,able_recipe,libwebp,libogg,libopus,opusfile,numpy,cryptography,ffpyplayer,codec2,pycodec2,sh,pynacl,typing-extensions,mistune>=3.0.2,beautifulsoup4 From 6a56d02afb54f76a43228f02eb33f067b5423003 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sat, 5 Apr 2025 14:39:21 +0200 Subject: [PATCH 31/59] Fixed potential change during iteration --- sbapp/sideband/sense.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/sbapp/sideband/sense.py b/sbapp/sideband/sense.py index 34c2e14..0a22767 100644 --- a/sbapp/sideband/sense.py +++ b/sbapp/sideband/sense.py @@ -120,9 +120,11 @@ class Telemeter(): def stop_all(self): if not self.from_packed: - for sensor in self.sensors: + sensors = self.sensors.copy() + for sensor in sensors: if not sensor == "time": self.sensors[sensor].stop() + del sensors def read(self, sensor): if not self.from_packed: @@ -137,31 +139,38 @@ class Telemeter(): def read_all(self): readings = {} - for sensor in self.sensors: + sensors = self.sensors.copy() + for sensor in sensors: if self.sensors[sensor].active: if not self.from_packed: readings[sensor] = self.sensors[sensor].data else: readings[sensor] = self.sensors[sensor]._data + del sensors return readings def packed(self): packed = {} packed[Sensor.SID_TIME] = int(time.time()) - for sensor in self.sensors: + sensors = self.sensors.copy() + for sensor in sensors: if self.sensors[sensor].active: packed[self.sensors[sensor].sid] = self.sensors[sensor].pack() + + del sensors return umsgpack.packb(packed) def render(self, relative_to=None): rendered = [] - for sensor in self.sensors: + sensors = self.sensors.copy() + for sensor in sensors: s = self.sensors[sensor] if s.active: r = s.render(relative_to) if r: rendered.append(r) + del sensors return rendered def check_permission(self, permission): From e8461b3f33a1bc3eac63d0a1541db034bbf8a74e Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 7 Apr 2025 18:21:35 +0200 Subject: [PATCH 32/59] Cleanup --- sbapp/sideband/mqtt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbapp/sideband/mqtt.py b/sbapp/sideband/mqtt.py index df55388..b035f8a 100644 --- a/sbapp/sideband/mqtt.py +++ b/sbapp/sideband/mqtt.py @@ -44,7 +44,7 @@ class MQTT(): RNS.log("All MQTT messages processed", RNS.LOG_DEBUG) except Exception as e: - RNS.log("An error occurred while running MQTT scheduler jobs: {e}", RNS.LOG_ERROR) + RNS.log(f"An error occurred while running MQTT scheduler jobs: {e}", RNS.LOG_ERROR) RNS.trace_exception(e) time.sleep(MQTT.SCHEDULER_SLEEP) From a97c6dc9bb3f0c82bc9aea2227e43cd7ae214449 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 8 Apr 2025 18:19:10 +0200 Subject: [PATCH 33/59] Updated versions --- sbapp/main.py | 2 +- setup.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 37d1d3d..f6e92a9 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1,6 +1,6 @@ __debug_build__ = False __disable_shaders__ = False -__version__ = "1.5.0" +__version__ = "1.5.1" __variant__ = "" import sys diff --git a/setup.py b/setup.py index 604c0c1..8abfe15 100644 --- a/setup.py +++ b/setup.py @@ -114,8 +114,8 @@ setuptools.setup( ] }, install_requires=[ - "rns>=0.9.3", - "lxmf>=0.6.2", + "rns>=0.9.4", + "lxmf>=0.6.3", "kivy>=2.3.0", "pillow>=10.2.0", "qrcode", From 9749147b346d564b56e55e5a8f25db17b3645e03 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Wed, 9 Apr 2025 17:16:30 +0200 Subject: [PATCH 34/59] Use abstract domain sockets for RPC. Use epoll backend for TCP connections on Android. --- sbapp/sideband/core.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 161854e..8533a70 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -575,7 +575,7 @@ class SidebandCore(): RNS.log("Loading Sideband identity...", RNS.LOG_DEBUG) self.identity = RNS.Identity.from_file(self.identity_path) - self.rpc_addr = ("127.0.0.1", 48165) + self.rpc_addr = f"\0sideband/rpc" self.rpc_key = RNS.Identity.full_hash(self.identity.get_private_key()) RNS.log("Loading Sideband configuration... "+str(self.config_path), RNS.LOG_DEBUG) @@ -1790,7 +1790,7 @@ class SidebandCore(): try: with self.rpc_lock: if self.rpc_connection == None: - self.rpc_connection = multiprocessing.connection.Client(self.rpc_addr, authkey=self.rpc_key) + self.rpc_connection = multiprocessing.connection.Client(self.rpc_addr, family="AF_UNIX", authkey=self.rpc_key) self.rpc_connection.send(request) response = self.rpc_connection.recv() return response @@ -1962,12 +1962,12 @@ class SidebandCore(): def __start_rpc_listener(self): try: RNS.log("Starting RPC listener", RNS.LOG_DEBUG) - self.rpc_listener = multiprocessing.connection.Listener(self.rpc_addr, authkey=self.rpc_key) + self.rpc_listener = multiprocessing.connection.Listener(self.rpc_addr, family="AF_UNIX", authkey=self.rpc_key) thread = threading.Thread(target=self.__rpc_loop) thread.daemon = True thread.start() except Exception as e: - RNS.log("Could not start RPC listener on "+str(self.rpc_addr)+". Terminating now. Clear up anything using the port and try again.", RNS.LOG_ERROR) + RNS.log("Could not start RPC listener on @"+str(self.rpc_addr[1:])+". Terminating now. Clear up anything using the port and try again.", RNS.LOG_ERROR) RNS.panic() def __rpc_loop(self): @@ -4115,13 +4115,13 @@ class SidebandCore(): ifac_size = None interface_config = { - "name": "TCPClientInterface", + "name": "TCP Client", "target_host": tcp_host, "target_port": tcp_port, "kiss_framing": False, "i2p_tunneled": False, } - tcpinterface = RNS.Interfaces.TCPInterface.TCPClientInterface(RNS.Transport, interface_config) + tcpinterface = RNS.Interfaces.BackboneInterface.BackboneClientInterface(RNS.Transport, interface_config) tcpinterface.OUT = True if RNS.Reticulum.transport_enabled(): From b86725c96d1f827cf5bb124a5cecb33aa55a51e6 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 17 Apr 2025 14:09:32 +0200 Subject: [PATCH 35/59] Added console argument --- sbapp/main.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index f6e92a9..fd29f19 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -9,6 +9,7 @@ parser = argparse.ArgumentParser(description="Sideband LXMF Client") parser.add_argument("-v", "--verbose", action='store_true', default=False, help="increase logging verbosity") parser.add_argument("-c", "--config", action='store', default=None, help="specify path of config directory") parser.add_argument("-d", "--daemon", action='store_true', default=False, help="run as a daemon, without user interface") +parser.add_argument("-i", "--interactive", action='store_true', default=False, help="connect interactive console after daemon init") parser.add_argument("--export-settings", action='store', default=None, help="export application settings to file") parser.add_argument("--import-settings", action='store', default=None, help="import application settings from file") parser.add_argument("--version", action="version", version="sideband {version}".format(version=__version__)) @@ -1701,14 +1702,12 @@ class SidebandApp(MDApp): if self.outbound_mode_command: return - def cb(dt): - self.message_send_dispatch(sender) + def cb(dt): self.message_send_dispatch(sender) Clock.schedule_once(cb, 0.20) def message_send_dispatch(self, sender=None): self.messages_view.ids.message_send_button.disabled = True - def cb(dt): - self.messages_view.ids.message_send_button.disabled = False + def cb(dt): self.messages_view.ids.message_send_button.disabled = False Clock.schedule_once(cb, 0.5) if self.root.ids.screen_manager.current == "messages_screen": @@ -6448,8 +6447,14 @@ def run(): sideband.version_str = "v"+__version__+" "+__variant__ sideband.start() - while True: - time.sleep(5) + + if args.interactive: + global sbcore; sbcore = sideband + while not sbcore.getstate("core.started") == True: time.sleep(0.1) + time.sleep(1) + import code; code.interact(local=globals()) + else: + while True: time.sleep(5) else: ExceptionManager.add_handler(SidebandExceptionHandler()) SidebandApp().run() From 9e636de5b17a8d48ccb9f7caff7ba9c0bee2ca44 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 17 Apr 2025 20:35:30 +0200 Subject: [PATCH 36/59] Added basic console functionality --- sbapp/main.py | 11 ++-- sbapp/sideband/console.py | 103 ++++++++++++++++++++++++++++++++++++++ sbapp/sideband/core.py | 16 +++--- 3 files changed, 118 insertions(+), 12 deletions(-) create mode 100644 sbapp/sideband/console.py diff --git a/sbapp/main.py b/sbapp/main.py index fd29f19..2515b42 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -2857,7 +2857,7 @@ class SidebandApp(MDApp): self.information_screen.ids.information_scrollview.effect_cls = ScrollEffect self.information_screen.ids.information_logo.icon = self.sideband.asset_dir+"/rns_256.png" - str_comps = " - [b]Reticulum[/b] (MIT License)\n - [b]LXMF[/b] (MIT License)\n - [b]KivyMD[/b] (MIT License)" + str_comps = " - [b]Reticulum[/b] (Reticulum License)\n - [b]LXMF[/b] (Reticulum License)\n - [b]KivyMD[/b] (MIT License)" str_comps += "\n - [b]Kivy[/b] (MIT License)\n - [b]Codec2[/b] (LGPL License)\n - [b]PyCodec2[/b] (BSD-3 License)" str_comps += "\n - [b]PyDub[/b] (MIT License)\n - [b]PyOgg[/b] (Public Domain)\n - [b]FFmpeg[/b] (GPL3 License)" str_comps += "\n - [b]GeoidHeight[/b] (LGPL License)\n - [b]Paho MQTT[/b] (EPL2 License)\n - [b]Python[/b] (PSF License)" @@ -6442,6 +6442,7 @@ def run(): config_path=args.config, is_client=False, verbose=(args.verbose or __debug_build__), + quiet=(args.interactive and not args.verbose), is_daemon=True ) @@ -6449,10 +6450,10 @@ def run(): sideband.start() if args.interactive: - global sbcore; sbcore = sideband - while not sbcore.getstate("core.started") == True: time.sleep(0.1) - time.sleep(1) - import code; code.interact(local=globals()) + while not sideband.getstate("core.started") == True: time.sleep(0.1) + from .sideband import console + console.attach(sideband) + else: while True: time.sleep(5) else: diff --git a/sbapp/sideband/console.py b/sbapp/sideband/console.py new file mode 100644 index 0000000..d6b9ec9 --- /dev/null +++ b/sbapp/sideband/console.py @@ -0,0 +1,103 @@ +import os +import RNS +import threading +from prompt_toolkit.application import Application +from prompt_toolkit.document import Document +from prompt_toolkit.key_binding import KeyBindings +from prompt_toolkit.layout.containers import HSplit, Window +from prompt_toolkit.layout.layout import Layout +from prompt_toolkit.styles import Style +from prompt_toolkit.widgets import SearchToolbar, TextArea + +sideband = None +application = None +output_document = Document(text="", cursor_position=0) +output_field = None + +def attach(target_core): + global sideband + sideband = target_core + RNS.logdest = RNS.LOG_CALLBACK + RNS.logcall = receive_output + console() + +def parse(uin): + args = uin.split(" ") + cmd = args[0] + if cmd == "q" or cmd == "quit": quit_action() + elif cmd == "clear": cmd_clear(args) + elif cmd == "raw": cmd_raw(args, uin.replace("raw ", "")) + elif cmd == "log": cmd_log(args) + else: receive_output(f"Unknown command: {cmd}") + +def cmd_clear(args): + output_document = output_document = Document(text="", cursor_position=0) + output_field.buffer.document = output_document + +def cmd_raw(args, expr): + if expr != "" and expr != "raw": + try: receive_output(eval(expr)) + except Exception as e: receive_output(str(e)) + +def cmd_log(args): + try: + if len(args) == 1: receive_output(f"Current loglevel is {RNS.loglevel}") + else: RNS.loglevel = int(args[1]); receive_output(f"Loglevel set to {RNS.loglevel}") + except Exception as e: + receive_output("Invalid loglevel: {e}") + +def set_log(level=None): + if level: RNS.loglevel = level + if RNS.loglevel == 0: receive_output("Logging squelched. Use log command to print output to console.") + +def quit_action(): + receive_output("Shutting down Sideband...") + sideband.should_persist_data() + application.exit() + +def receive_output(msg): + global output_document, output_field + content = f"{output_field.text}\n{msg}" + output_document = output_document = Document(text=content, cursor_position=len(content)) + output_field.buffer.document = output_document + +def console(): + global output_document, output_field, application + search_field = SearchToolbar() + + output_field = TextArea(style="class:output-field", text="Sideband console ready") + input_field = TextArea( + height=1, + prompt="> ", + style="class:input-field", + multiline=False, + wrap_lines=False, + search_field=search_field) + + container = HSplit([ + output_field, + Window(height=1, char="-", style="class:line"), + input_field, + search_field]) + + def accept(buff): parse(input_field.text) + input_field.accept_handler = accept + + kb = KeyBindings() + @kb.add("c-c") + @kb.add("c-q") + def _(event): quit_action() + + style = Style([ + ("line", "#004444"), + ]) + + application = Application( + layout=Layout(container, focused_element=input_field), + key_bindings=kb, + style=style, + mouse_support=True, + full_screen=False) + + set_log() + application.run() \ No newline at end of file diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 8533a70..be15a90 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -148,7 +148,7 @@ class SidebandCore(): self.log_announce(destination_hash, app_data, dest_type=SidebandCore.aspect_filter, stamp_cost=sc, link_stats=link_stats) - def __init__(self, owner_app, config_path = None, is_service=False, is_client=False, android_app_dir=None, verbose=False, owner_service=None, service_context=None, is_daemon=False, load_config_only=False): + def __init__(self, owner_app, config_path = None, is_service=False, is_client=False, android_app_dir=None, verbose=False, quiet=False, owner_service=None, service_context=None, is_daemon=False, load_config_only=False): self.is_service = is_service self.is_client = is_client self.is_daemon = is_daemon @@ -164,7 +164,8 @@ class SidebandCore(): else: self.is_standalone = False - self.log_verbose = verbose + self.log_verbose = (verbose and not quiet) + self.log_quiet = quiet self.log_deque = deque(maxlen=self.LOG_DEQUE_MAXLEN) self.owner_app = owner_app self.reticulum = None @@ -4023,10 +4024,9 @@ class SidebandCore(): def _reticulum_log_debug(self, debug=False): self.log_verbose = debug - if self.log_verbose: - selected_level = 6 - else: - selected_level = 2 + if self.log_quiet: selected_level = 0 + elif self.log_verbose: selected_level = 6 + else: selected_level = 2 RNS.loglevel = selected_level if self.is_client: @@ -4041,7 +4041,9 @@ class SidebandCore(): return "\n".join(self.log_deque) def __start_jobs_immediate(self): - if self.log_verbose: + if self.log_quiet: + selected_level = 0 + elif self.log_verbose: selected_level = 6 else: selected_level = 2 From a60c0d830e7eadab7097dd577da15390f1819d28 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 29 Apr 2025 11:44:36 +0200 Subject: [PATCH 37/59] Updated readme and gitignore --- .gitignore | 1 + README.md | 11 ++++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7750d9e..efbd926 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ dist docs/build sideband*.egg-info sbapp*.egg-info +LXST diff --git a/README.md b/README.md index 2f07d59..cfb7fec 100644 --- a/README.md +++ b/README.md @@ -315,16 +315,17 @@ You can help support the continued development of open, free and private communi ``` 84FpY1QbxHcgdseePYNmhTHcrgMX4nFfBYtz2GKYToqHVVhJp8Eaw1Z1EedRnKD19b3B8NiLCGVxzKV17UMmmeEsCrPyA5w ``` -- Ethereum - ``` - 0xFDabC71AC4c0C78C95aDDDe3B4FA19d6273c5E73 - ``` - Bitcoin ``` - 35G9uWVzrpJJibzUwpNUQGQNFzLirhrYAH + bc1p4a6axuvl7n9hpapfj8sv5reqj8kz6uxa67d5en70vzrttj0fmcusgxsfk5 + ``` +- Ethereum + ``` + 0xae89F3B94fC4AD6563F0864a55F9a697a90261ff ``` - Ko-Fi: https://ko-fi.com/markqvist +
# License From 922dd91d7f51a9a8cb41e06f5c228d1b5cb621a5 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 6 May 2025 19:11:39 +0200 Subject: [PATCH 38/59] Added option to specify RNS config path --- sbapp/main.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 2515b42..d1325b2 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -8,6 +8,7 @@ import argparse parser = argparse.ArgumentParser(description="Sideband LXMF Client") parser.add_argument("-v", "--verbose", action='store_true', default=False, help="increase logging verbosity") parser.add_argument("-c", "--config", action='store', default=None, help="specify path of config directory") +parser.add_argument("-r", "--rnsconfig", action='store', default=None, help="specify path of RNS config directory") parser.add_argument("-d", "--daemon", action='store_true', default=False, help="run as a daemon, without user interface") parser.add_argument("-i", "--interactive", action='store_true', default=False, help="connect interactive console after daemon init") parser.add_argument("--export-settings", action='store', default=None, help="export application settings to file") @@ -346,7 +347,7 @@ class SidebandApp(MDApp): if RNS.vendor.platformutils.get_platform() == "android": self.sideband = SidebandCore(self, config_path=self.config_path, is_client=True, android_app_dir=self.app_dir, verbose=__debug_build__) else: - self.sideband = SidebandCore(self, config_path=self.config_path, is_client=False, verbose=(args.verbose or __debug_build__)) + self.sideband = SidebandCore(self, config_path=self.config_path, is_client=False, verbose=(args.verbose or __debug_build__),rns_config_path=args.rnsconfig) self.sideband.version_str = "v"+__version__+" "+__variant__ @@ -6443,7 +6444,8 @@ def run(): is_client=False, verbose=(args.verbose or __debug_build__), quiet=(args.interactive and not args.verbose), - is_daemon=True + is_daemon=True, + rns_config_path=args.rnsconfig, ) sideband.version_str = "v"+__version__+" "+__variant__ From 0e552d4b9d4ab9ed107fef8a2e4bd5a82886a378 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 6 May 2025 19:11:54 +0200 Subject: [PATCH 39/59] Added link mode to object details screen --- sbapp/sideband/core.py | 36 ++++++++++++++++++++++++++++++++++-- sbapp/ui/objectdetails.py | 7 +++++++ 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index be15a90..7a17b8a 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -148,7 +148,7 @@ class SidebandCore(): self.log_announce(destination_hash, app_data, dest_type=SidebandCore.aspect_filter, stamp_cost=sc, link_stats=link_stats) - def __init__(self, owner_app, config_path = None, is_service=False, is_client=False, android_app_dir=None, verbose=False, quiet=False, owner_service=None, service_context=None, is_daemon=False, load_config_only=False): + def __init__(self, owner_app, config_path = None, is_service=False, is_client=False, android_app_dir=None, verbose=False, quiet=False, owner_service=None, service_context=None, is_daemon=False, load_config_only=False, rns_config_path=None): self.is_service = is_service self.is_client = is_client self.is_daemon = is_daemon @@ -209,7 +209,7 @@ class SidebandCore(): self.cache_dir = self.app_dir+"/cache" - self.rns_configdir = None + self.rns_configdir = rns_config_path core_path = os.path.abspath(__file__) if "core.pyc" in core_path: @@ -1960,6 +1960,38 @@ class SidebandCore(): RNS.log(ed, RNS.LOG_DEBUG) return None + def _get_destination_lmd(self, destination_hash): + try: + mr = self.message_router + oh = destination_hash + ol = None + if oh in mr.direct_links: + ol = mr.direct_links[oh] + elif oh in mr.backchannel_links: + ol = mr.backchannel_links[oh] + + if ol != None: return ol.get_mode() + + return None + + except Exception as e: + RNS.trace_exception(e) + return None + + def get_destination_lmd(self, destination_hash): + if not RNS.vendor.platformutils.is_android(): + return self._get_destination_lmd(destination_hash) + else: + if self.is_service: + return self._get_destination_lmd(destination_hash) + else: + try: + return self.service_rpc_request({"get_destination_lmd": destination_hash}) + except Exception as e: + ed = "Error while getting destination link mode over RPC: "+str(e) + RNS.log(ed, RNS.LOG_DEBUG) + return None + def __start_rpc_listener(self): try: RNS.log("Starting RPC listener", RNS.LOG_DEBUG) diff --git a/sbapp/ui/objectdetails.py b/sbapp/ui/objectdetails.py index 0de4f3d..e61b36e 100644 --- a/sbapp/ui/objectdetails.py +++ b/sbapp/ui/objectdetails.py @@ -830,12 +830,19 @@ class RVDetails(MDRecycleView): ler = self.delegate.app.sideband.get_destination_establishment_rate(self.delegate.object_hash) mtu = self.delegate.app.sideband.get_destination_mtu(self.delegate.object_hash) or RNS.Reticulum.MTU edr = self.delegate.app.sideband.get_destination_edr(self.delegate.object_hash) + lmd = self.delegate.app.sideband.get_destination_lmd(self.delegate.object_hash) if ler: lers = RNS.prettyspeed(ler, "b") mtus = RNS.prettysize(mtu) edrs = f"{RNS.prettyspeed(edr)}" if edr != None else "" self.entries.append({"icon": "lock-check-outline", "text": f"Link established, LER is [b]{lers}[/b], MTU is [b]{mtus}[/b]", "on_release": pass_job}) if edr: self.entries.append({"icon": "approximately-equal", "text": f"Expected data rate is [b]{edrs}[/b]", "on_release": pass_job}) + if lmd != None: + if lmd in RNS.Link.MODE_DESCRIPTIONS: lmds = RNS.Link.MODE_DESCRIPTIONS[lmd] + else: lmds = "unknown" + if lmds == "AES_128_CBC": lmds = "X25519/AES128" + elif lmds == "AES_256_CBC": lmds = "X25519/AES256" + self.entries.append({"icon": "link-lock", "text": f"Link mode is [b]{lmds}[/b]", "on_release": pass_job}) except Exception as e: RNS.trace_exception(e) From 55bf57d0abf3d21173c47ba527c491dc60957611 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 6 May 2025 19:15:41 +0200 Subject: [PATCH 40/59] Updated version and RNS dependency version --- sbapp/main.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index d1325b2..85f4a7f 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1,6 +1,6 @@ __debug_build__ = False __disable_shaders__ = False -__version__ = "1.5.1" +__version__ = "1.6.0" __variant__ = "" import sys diff --git a/setup.py b/setup.py index 8abfe15..32638bb 100644 --- a/setup.py +++ b/setup.py @@ -114,7 +114,7 @@ setuptools.setup( ] }, install_requires=[ - "rns>=0.9.4", + "rns>=0.9.5", "lxmf>=0.6.3", "kivy>=2.3.0", "pillow>=10.2.0", From 09f6d4bd982b0b3580341112cbf7b119edd1d03e Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 11 May 2025 22:32:02 +0200 Subject: [PATCH 41/59] Added transfer speed to outgoing message status --- sbapp/ui/messages.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/sbapp/ui/messages.py b/sbapp/ui/messages.py index 3a0722c..9e7ae76 100644 --- a/sbapp/ui/messages.py +++ b/sbapp/ui/messages.py @@ -319,6 +319,19 @@ class Messages(): prgstr = "" sphrase = "Sending" prg = self.app.sideband.get_lxm_progress(msg["hash"]) + if not hasattr(w, "last_prg_update"): + w.last_prg_update = time.time() + w.last_prg = prg + speed = None + else: + now = time.time() + size = msg["lxm"].packed_size + td = now - w.last_prg_update + if td == 0: speed = None + else: + bd = prg*size - w.last_prg*size + speed = (bd/td)*8 + if prg != None: prgstr = ", "+str(round(prg*100, 1))+"% done" if prg <= 0.00: @@ -336,6 +349,7 @@ class Messages(): sphrase = "Link established" elif prg >= 0.05: sphrase = "Sending" + if speed != None: prgstr += f", {RNS.prettyspeed(speed)}" if msg["title"]: titlestr = "[b]Title[/b] "+msg["title"].decode("utf-8")+"\n" @@ -1450,7 +1464,10 @@ Builder.load_string(""" id: heading_text markup: True text: root.heading - adaptive_size: True + size_hint_y: None + height: self.texture_size[1] + # adaptive_size: True + # theme_text_color: 'Custom' # text_color: rgba(255,255,255,100) pos: 0, root.height - (self.height + root.padding[0] + dp(8)) From 2638688bbc820c24520f532d176acd1162695b78 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 12 May 2025 00:08:57 +0200 Subject: [PATCH 42/59] Added ability to exclude objects from telemetry collector responses --- sbapp/main.py | 2 +- sbapp/sideband/core.py | 116 ++++++++++++++++++++++++++++------------- 2 files changed, 82 insertions(+), 36 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 85f4a7f..5b06e44 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -5464,7 +5464,7 @@ class SidebandApp(MDApp): self.telemetry_info_dialog.dismiss() ok_button.bind(on_release=dl_ok) - result = self.sideband.request_latest_telemetry(from_addr=self.sideband.config["telemetry_collector"]) + result = self.sideband.request_latest_telemetry(from_addr=self.sideband.config["telemetry_collector"], is_collector_request=True) if result == "no_address": title_str = "Invalid Address" diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 7a17b8a..6a288a9 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -177,6 +177,7 @@ class SidebandCore(): self.latest_telemetry = None self.latest_packed_telemetry = None self.telemetry_changes = 0 + self.telemetry_response_excluded = [] self.pending_telemetry_send = False self.pending_telemetry_send_try = 0 self.pending_telemetry_send_maxtries = 2 @@ -253,13 +254,15 @@ class SidebandCore(): if not os.path.isdir(self.app_dir+"/app_storage"): os.makedirs(self.app_dir+"/app_storage") - self.config_path = self.app_dir+"/app_storage/sideband_config" - self.identity_path = self.app_dir+"/app_storage/primary_identity" - self.db_path = self.app_dir+"/app_storage/sideband.db" - self.lxmf_storage = self.app_dir+"/app_storage/" - self.log_dir = self.app_dir+"/app_storage/" - self.tmp_dir = self.app_dir+"/app_storage/tmp" - self.exports_dir = self.app_dir+"/exports" + self.config_path = self.app_dir+"/app_storage/sideband_config" + self.identity_path = self.app_dir+"/app_storage/primary_identity" + self.db_path = self.app_dir+"/app_storage/sideband.db" + self.lxmf_storage = self.app_dir+"/app_storage/" + self.log_dir = self.app_dir+"/app_storage/" + self.tmp_dir = self.app_dir+"/app_storage/tmp" + self.exports_dir = self.app_dir+"/exports" + self.telemetry_exclude_path = self.app_dir+"/app_storage/collector_response_excluded" + if RNS.vendor.platformutils.is_android(): self.webshare_dir = "./share/" else: @@ -572,6 +575,31 @@ class SidebandCore(): self.save_configuration() + def __load_telemetry_collector_excluded(self): + if not os.path.isfile(self.telemetry_exclude_path): + try: + file = open(self.telemetry_exclude_path, "wb") + file.write("# To exclude destinations from telemetry\n# collector responses, add them to this\n# file with one destination hash per line\n".encode("utf-8")) + file.close() + except Exception as e: + RNS.log(f"Could not create telemetry collector exclude file at {self.telemetry_exclude_path}", RNS.LOG_ERROR) + + try: + with open(self.telemetry_exclude_path, "rb") as file: + data = file.read().decode("utf-8") + for line in data.splitlines(): + if not line.startswith("#"): + if len(line) >= RNS.Reticulum.TRUNCATED_HASHLENGTH//8*2: + try: + destination_hash = bytes.fromhex(line[:RNS.Reticulum.TRUNCATED_HASHLENGTH//8*2]) + self.telemetry_response_excluded.append(destination_hash) + except Exception as e: + RNS.log(f"Invalid destination hash {line} in telemetry response exclude file: {e}", RNS.LOG_ERROR) + + except Exception as e: + RNS.log(f"Error while loading telemetry collector response excludes: {e}", RNS.LOG_ERROR) + + def __load_config(self): RNS.log("Loading Sideband identity...", RNS.LOG_DEBUG) self.identity = RNS.Identity.from_file(self.identity_path) @@ -870,6 +898,8 @@ class SidebandCore(): self._db_upgradetables() self.__db_indices() + self.__load_telemetry_collector_excluded() + def __reload_config(self): RNS.log("Reloading Sideband configuration... ", RNS.LOG_DEBUG) with open(self.config_path, "rb") as config_file: @@ -1371,13 +1401,13 @@ class SidebandCore(): else: self.setstate(f"telemetry.{RNS.hexrep(message.destination_hash, delimit=False)}.request_sending", False) - def _service_request_latest_telemetry(self, from_addr=None): + def _service_request_latest_telemetry(self, from_addr=None, is_collector_request=False): if not RNS.vendor.platformutils.is_android(): return False else: if self.is_client: try: - return self.service_rpc_request({"request_latest_telemetry": {"from_addr": from_addr}}) + return self.service_rpc_request({"request_latest_telemetry": {"from_addr": from_addr, "is_collector_request": is_collector_request}}) except Exception as e: RNS.log("Error while requesting latest telemetry over RPC: "+str(e), RNS.LOG_DEBUG) @@ -1386,10 +1416,10 @@ class SidebandCore(): else: return False - def request_latest_telemetry(self, from_addr=None, is_livetrack=False): + def request_latest_telemetry(self, from_addr=None, is_livetrack=False, is_collector_request=False): if self.allow_service_dispatch and self.is_client: try: - return self._service_request_latest_telemetry(from_addr) + return self._service_request_latest_telemetry(from_addr, is_collector_request=is_collector_request) except Exception as e: RNS.log("Error requesting latest telemetry: "+str(e), RNS.LOG_ERROR) @@ -1428,7 +1458,7 @@ class SidebandCore(): request_timebase = self.getpersistent(f"telemetry.{RNS.hexrep(from_addr, delimit=False)}.timebase") or now - self.telemetry_request_max_history lxm_fields = { LXMF.FIELD_COMMANDS: [ - {Commands.TELEMETRY_REQUEST: request_timebase}, + {Commands.TELEMETRY_REQUEST: [request_timebase, is_collector_request]}, ]} lxm = LXMF.LXMessage(dest, source, "", desired_method=desired_method, fields = lxm_fields, include_ticket=True) @@ -1524,7 +1554,7 @@ class SidebandCore(): else: return False - def send_latest_telemetry(self, to_addr=None, stream=None, is_authorized_telemetry_request=False): + def send_latest_telemetry(self, to_addr=None, stream=None, is_authorized_telemetry_request=False, is_collector_response=False): if self.allow_service_dispatch and self.is_client: try: return self._service_send_latest_telemetry(to_addr, stream, is_authorized_telemetry_request) @@ -1566,7 +1596,7 @@ class SidebandCore(): else: desired_method = LXMF.LXMessage.DIRECT - lxm_fields = self.get_message_fields(to_addr, is_authorized_telemetry_request=is_authorized_telemetry_request, signal_already_sent=True) + lxm_fields = self.get_message_fields(to_addr, is_authorized_telemetry_request=is_authorized_telemetry_request, signal_already_sent=True, is_collector_response=is_collector_response) if lxm_fields == False and stream == None: return "already_sent" @@ -2065,7 +2095,7 @@ class SidebandCore(): connection.send(send_result) elif "request_latest_telemetry" in call: args = call["request_latest_telemetry"] - send_result = self.request_latest_telemetry(args["from_addr"]) + send_result = self.request_latest_telemetry(args["from_addr"], is_collector_request=args["is_collector_request"]) connection.send(send_result) elif "send_latest_telemetry" in call: args = call["send_latest_telemetry"] @@ -3146,6 +3176,7 @@ class SidebandCore(): tpacked = telemetry_entry[2] appearance = telemetry_entry[3] max_timebase = max(max_timebase, ttstamp) + if self._db_save_telemetry(tsource, tpacked, via = context_dest): RNS.log("Saved telemetry stream entry from "+RNS.prettyhexrep(tsource), RNS.LOG_DEBUG) if appearance != None: @@ -3804,7 +3835,7 @@ class SidebandCore(): if now > last_request_timebase+request_interval: try: RNS.log("Initiating telemetry request to collector", RNS.LOG_DEBUG) - self.request_latest_telemetry(from_addr=self.config["telemetry_collector"]) + self.request_latest_telemetry(from_addr=self.config["telemetry_collector"], is_collector_request=True) except Exception as e: RNS.log("An error occurred while requesting a telemetry update from collector. The contained exception was: "+str(e), RNS.LOG_ERROR) @@ -4428,7 +4459,7 @@ class SidebandCore(): except Exception as e: RNS.log("Error while setting last successul telemetry timebase for "+RNS.prettyhexrep(message.destination_hash), RNS.LOG_DEBUG) - def get_message_fields(self, context_dest, telemetry_update=False, is_authorized_telemetry_request=False, signal_already_sent=False): + def get_message_fields(self, context_dest, telemetry_update=False, is_authorized_telemetry_request=False, signal_already_sent=False, is_collector_response=False): fields = {} send_telemetry = (telemetry_update == True) or (self.should_send_telemetry(context_dest) or is_authorized_telemetry_request) send_appearance = self.config["telemetry_send_appearance"] or send_telemetry @@ -4437,7 +4468,10 @@ class SidebandCore(): telemeter = Telemeter.from_packed(self.latest_packed_telemetry) telemetry_timebase = telemeter.read_all()["time"]["utc"] last_success_tb = (self.getpersistent(f"telemetry.{RNS.hexrep(context_dest, delimit=False)}.last_send_success_timebase") or 0) - if telemetry_timebase > last_success_tb: + if is_collector_response and self.lxmf_destination.hash in self.telemetry_response_excluded: + RNS.log("Not embedding own telemetry collector response since own destination hash is excluded", RNS.LOG_DEBUG) + send_telemetry = False + elif telemetry_timebase > last_success_tb: RNS.log("Embedding own telemetry in message since current telemetry is newer than latest successful timebase", RNS.LOG_DEBUG) else: RNS.log("Not embedding own telemetry in message since current telemetry timebase ("+str(telemetry_timebase)+") is not newer than latest successful timebase ("+str(last_success_tb)+")", RNS.LOG_DEBUG) @@ -5200,11 +5234,19 @@ class SidebandCore(): RNS.log("Handling commands from "+RNS.prettyhexrep(context_dest), RNS.LOG_DEBUG) for command in commands: if Commands.TELEMETRY_REQUEST in command: - timebase = int(command[Commands.TELEMETRY_REQUEST]) + if type(command[Commands.TELEMETRY_REQUEST]) == list: + command_timebase = command[Commands.TELEMETRY_REQUEST][0] + enable_collector_request = command[Commands.TELEMETRY_REQUEST][1] + else: + # Handle old request format + command_timebase = command[Commands.TELEMETRY_REQUEST] + enable_collector_request = True + + timebase = int(command_timebase) RNS.log("Handling telemetry request with timebase "+str(timebase), RNS.LOG_DEBUG) - if self.config["telemetry_collector_enabled"]: + if self.config["telemetry_collector_enabled"] and enable_collector_request: RNS.log(f"Collector requests enabled, returning complete telemetry response for all known objects since {timebase}", RNS.LOG_DEBUG) - self.create_telemetry_collector_response(to_addr=context_dest, timebase=timebase, is_authorized_telemetry_request=True) + self.create_telemetry_collector_response(to_addr=context_dest, timebase=timebase, is_authorized_telemetry_request=True, is_collector_response=True) else: RNS.log("Responding with own latest telemetry", RNS.LOG_DEBUG) self.send_latest_telemetry(to_addr=context_dest) @@ -5240,7 +5282,7 @@ class SidebandCore(): except Exception as e: RNS.log("Error while handling commands: "+str(e), RNS.LOG_ERROR) - def create_telemetry_collector_response(self, to_addr, timebase, is_authorized_telemetry_request=False): + def create_telemetry_collector_response(self, to_addr, timebase, is_authorized_telemetry_request=False, is_collector_response=False): if self.getstate(f"telemetry.{RNS.hexrep(to_addr, delimit=False)}.update_sending") == True: RNS.log("Not sending new telemetry collector response, since an earlier transfer is already in progress", RNS.LOG_DEBUG) return "in_progress" @@ -5252,20 +5294,23 @@ class SidebandCore(): elements = 0; added = 0 telemetry_stream = [] for source in sources: - if source != to_addr: - for entry in sources[source]: - elements += 1 - timestamp = entry[0]; packed_telemetry = entry[1] - appearance = self._db_get_appearance(source, raw=True) - te = [source, timestamp, packed_telemetry, appearance] - if only_latest: - if not source in added_sources: - added_sources[source] = True + if source in self.telemetry_response_excluded: + RNS.log(f"Excluding {RNS.prettyhexrep(source)} from collector response", RNS.LOG_DEBUG) + else: + if source != to_addr: + for entry in sources[source]: + elements += 1 + timestamp = entry[0]; packed_telemetry = entry[1] + appearance = self._db_get_appearance(source, raw=True) + te = [source, timestamp, packed_telemetry, appearance] + if only_latest: + if not source in added_sources: + added_sources[source] = True + telemetry_stream.append(te) + added += 1 + else: telemetry_stream.append(te) added += 1 - else: - telemetry_stream.append(te) - added += 1 if len(telemetry_stream) == 0: RNS.log(f"No new telemetry for request with timebase {timebase}", RNS.LOG_DEBUG) @@ -5273,7 +5318,8 @@ class SidebandCore(): return self.send_latest_telemetry( to_addr=to_addr, stream=telemetry_stream, - is_authorized_telemetry_request=is_authorized_telemetry_request + is_authorized_telemetry_request=is_authorized_telemetry_request, + is_collector_response=is_collector_response, ) From eb4d31ab354377786f340b8d9f45be15fbcdbea4 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 12 May 2025 11:59:08 +0200 Subject: [PATCH 43/59] Updated dependencies --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 32638bb..7603f62 100644 --- a/setup.py +++ b/setup.py @@ -115,7 +115,7 @@ setuptools.setup( }, install_requires=[ "rns>=0.9.5", - "lxmf>=0.6.3", + "lxmf>=0.7.0", "kivy>=2.3.0", "pillow>=10.2.0", "qrcode", From 2f35ecff8036c453ad68f59d4bd98ca019f7c9ab Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 12 May 2025 14:46:23 +0200 Subject: [PATCH 44/59] Fixed missing none check --- sbapp/ui/messages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbapp/ui/messages.py b/sbapp/ui/messages.py index 9e7ae76..80f82a5 100644 --- a/sbapp/ui/messages.py +++ b/sbapp/ui/messages.py @@ -327,7 +327,7 @@ class Messages(): now = time.time() size = msg["lxm"].packed_size td = now - w.last_prg_update - if td == 0: speed = None + if td == 0 or prg == None or w.last_prg == None: speed = None else: bd = prg*size - w.last_prg*size speed = (bd/td)*8 From 4aa290e41eb07b8b0ce466b1073e63c7f7e22685 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 12 May 2025 18:15:58 +0200 Subject: [PATCH 45/59] Updated dependencies --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7603f62..1685226 100644 --- a/setup.py +++ b/setup.py @@ -123,7 +123,7 @@ setuptools.setup( "ffpyplayer", "sh", "numpy<=1.26.4", - "lxst>=0.2.7", + "lxst>=0.3.0", "mistune>=3.0.2", "beautifulsoup4", "pycodec2;sys.platform!='Windows' and sys.platform!='win32' and sys.platform!='darwin'", From 98c64acb3bf83e148fd0e9cde21fa9582bfb0562 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 13 May 2025 18:13:01 +0200 Subject: [PATCH 46/59] Updated version and RNS dependency version --- sbapp/main.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 5b06e44..5bcb6cc 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1,6 +1,6 @@ __debug_build__ = False __disable_shaders__ = False -__version__ = "1.6.0" +__version__ = "1.6.1" __variant__ = "" import sys diff --git a/setup.py b/setup.py index 1685226..4eb362f 100644 --- a/setup.py +++ b/setup.py @@ -114,7 +114,7 @@ setuptools.setup( ] }, install_requires=[ - "rns>=0.9.5", + "rns>=0.9.6", "lxmf>=0.7.0", "kivy>=2.3.0", "pillow>=10.2.0", From 137c0b284ed39c00d4fc03ebebe3c4b4ce20745e Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 15 May 2025 01:38:40 +0200 Subject: [PATCH 47/59] Added option to configure shared instance access --- sbapp/main.py | 8 +++++++- sbapp/sideband/core.py | 8 +++++++- sbapp/ui/layouts.py | 28 +++++++++++++++++++++++----- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 5bcb6cc..8abc5bc 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -3540,6 +3540,7 @@ class SidebandApp(MDApp): def save_connectivity(sender=None, event=None): self.sideband.config["connect_transport"] = self.connectivity_screen.ids.connectivity_enable_transport.active + self.sideband.config["connect_share_instance"] = self.connectivity_screen.ids.connectivity_share_instance.active self.sideband.config["connect_local"] = self.connectivity_screen.ids.connectivity_use_local.active self.sideband.config["connect_local_groupid"] = self.connectivity_screen.ids.connectivity_local_groupid.text self.sideband.config["connect_local_ifac_netname"] = self.connectivity_screen.ids.connectivity_local_ifac_netname.text @@ -3697,6 +3698,10 @@ class SidebandApp(MDApp): self.connectivity_screen.ids.connectivity_enable_transport.active = self.sideband.config["connect_transport"] con_collapse_transport(collapse=not self.sideband.config["connect_transport"]) self.connectivity_screen.ids.connectivity_enable_transport.bind(active=save_connectivity) + + self.connectivity_screen.ids.connectivity_share_instance.active = self.sideband.config["connect_share_instance"] + self.connectivity_screen.ids.connectivity_share_instance.bind(active=save_connectivity) + self.connectivity_screen.ids.connectivity_local_ifmode.text = self.sideband.config["connect_ifmode_local"].capitalize() self.connectivity_screen.ids.connectivity_tcp_ifmode.text = self.sideband.config["connect_ifmode_tcp"].capitalize() self.connectivity_screen.ids.connectivity_i2p_ifmode.text = self.sideband.config["connect_ifmode_i2p"].capitalize() @@ -3776,7 +3781,8 @@ class SidebandApp(MDApp): dialog.dismiss() yes_button.bind(on_release=dl_yes) - rpc_string = "rpc_key = "+RNS.hexrep(self.sideband.reticulum.rpc_key, delimit=False) + rpc_string = "shared_instance_type = tcp\n" + rpc_string += "rpc_key = "+RNS.hexrep(self.sideband.reticulum.rpc_key, delimit=False) Clipboard.copy(rpc_string) dialog.open() diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index 6a288a9..dff6a52 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -663,6 +663,8 @@ class SidebandCore(): self.config["config_template"] = None if not "connect_transport" in self.config: self.config["connect_transport"] = False + if not "connect_share_instance" in self.config: + self.config["connect_share_instance"] = False if not "connect_rnode" in self.config: self.config["connect_rnode"] = False if not "connect_rnode_ifac_netname" in self.config: @@ -4114,7 +4116,11 @@ class SidebandCore(): self.setstate("init.loadingstate", "Substantiating Reticulum") try: - self.reticulum = RNS.Reticulum(configdir=self.rns_configdir, loglevel=selected_level, logdest=self._log_handler) + if RNS.vendor.platformutils.is_android() and self.config["connect_share_instance"] == True: + self.reticulum = RNS.Reticulum(configdir=self.rns_configdir, loglevel=selected_level, logdest=self._log_handler, shared_instance_type="tcp") + else: + self.reticulum = RNS.Reticulum(configdir=self.rns_configdir, loglevel=selected_level, logdest=self._log_handler) + if RNS.vendor.platformutils.is_android(): if self.is_service: if os.path.isfile(self.rns_configdir+"/config_template_invalid"): diff --git a/sbapp/ui/layouts.py b/sbapp/ui/layouts.py index e520c34..48ff811 100644 --- a/sbapp/ui/layouts.py +++ b/sbapp/ui/layouts.py @@ -641,15 +641,33 @@ MDScreen: # font_size: dp(24) # # disabled: True - MDLabel: - text: "Shared Instance Access\\n" - id: connectivity_shared_access_label - font_style: "H5" + # MDLabel: + # text: "Shared Instance Access\\n" + # id: connectivity_shared_access_label + # font_style: "H5" + + MDBoxLayout: + orientation: "horizontal" + padding: [0,0,dp(24),0] + size_hint_y: None + height: dp(24) + + MDLabel: + id: connectivity_shared_label + text: "Share Reticulum Instance" + font_style: "H6" + # disabled: True + + MDSwitch: + id: connectivity_share_instance + active: False + pos_hint: {"center_y": 0.3} + # disabled: True MDLabel: id: connectivity_shared_access markup: True - text: "The Reticulum instance launched by Sideband will be available for other programs on this system. By default, this grants connectivity to other local Reticulum-based programs, but no access to management, interface status and path information.\\n\\nIf you want to allow full functionality and ability to manage the running instance, you will need to configure other programs to use the correct RPC key for this instance.\\n\\nThis can be very useful for using other tools related to Reticulum, for example via command-line programs running in Termux. To do this, use the button below to copy the RPC key configuration line, and paste it into the Reticulum configuration file within the Termux environment, or other program.\\n\\nPlease note! [b]It is not necessary[/b] to enable Reticulum Transport for this to work!\\n\\n" + text: "You can make the Reticulum instance launched by Sideband available for other programs on this system. By default, this grants connectivity to other local Reticulum-based programs, but no access to management, interface status and path information.\\n\\nIf you want to allow full functionality and ability to manage the running instance, you will need to configure other programs to use the correct RPC key for this instance.\\n\\nThis can be very useful for using other tools related to Reticulum, for example via command-line programs running in Termux. To do this, use the button below to copy the RPC key configuration line, and paste it into the Reticulum configuration file within the Termux environment, or other program.\\n\\nPlease note! [b]It is not necessary[/b] to enable Reticulum Transport for this to work!\\n\\n" size_hint_y: None text_size: self.width, None height: self.texture_size[1] From 5355f0e91f1a54f14297a2e744838eac5a719a82 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Thu, 15 May 2025 15:58:21 +0200 Subject: [PATCH 48/59] Fixed link stats in object details --- sbapp/sideband/core.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py index dff6a52..8fa432c 100644 --- a/sbapp/sideband/core.py +++ b/sbapp/sideband/core.py @@ -1896,12 +1896,12 @@ class SidebandCore(): mr = self.message_router oh = destination_hash ol = None - if oh in mr.direct_links: + if oh in mr.direct_links and mr.direct_links[oh].status == RNS.Link.ACTIVE: ol = mr.direct_links[oh] elif oh in mr.backchannel_links: ol = mr.backchannel_links[oh] - if ol != None: + if ol != None and ol.status == RNS.Link.ACTIVE: ler = ol.get_establishment_rate() if ler: return ler @@ -1931,12 +1931,12 @@ class SidebandCore(): mr = self.message_router oh = destination_hash ol = None - if oh in mr.direct_links: + if oh in mr.direct_links and mr.direct_links[oh].status == RNS.Link.ACTIVE: ol = mr.direct_links[oh] elif oh in mr.backchannel_links: ol = mr.backchannel_links[oh] - if ol != None: + if ol != None and ol.status == RNS.Link.ACTIVE: return ol.get_mtu() return None @@ -1964,12 +1964,12 @@ class SidebandCore(): mr = self.message_router oh = destination_hash ol = None - if oh in mr.direct_links: + if oh in mr.direct_links and mr.direct_links[oh].status == RNS.Link.ACTIVE: ol = mr.direct_links[oh] elif oh in mr.backchannel_links: ol = mr.backchannel_links[oh] - if ol != None: + if ol != None and ol.status == RNS.Link.ACTIVE: return ol.get_expected_rate() return None @@ -1997,12 +1997,12 @@ class SidebandCore(): mr = self.message_router oh = destination_hash ol = None - if oh in mr.direct_links: + if oh in mr.direct_links and mr.direct_links[oh].status == RNS.Link.ACTIVE: ol = mr.direct_links[oh] elif oh in mr.backchannel_links: ol = mr.backchannel_links[oh] - if ol != None: return ol.get_mode() + if ol != None and ol.status == RNS.Link.ACTIVE: return ol.get_mode() return None @@ -2072,6 +2072,8 @@ class SidebandCore(): connection.send(self._get_destination_mtu(call["get_destination_mtu"])) elif "get_destination_edr" in call: connection.send(self._get_destination_edr(call["get_destination_edr"])) + elif "get_destination_lmd" in call: + connection.send(self._get_destination_lmd(call["get_destination_lmd"])) elif "send_message" in call: args = call["send_message"] send_result = self.send_message( From 5c5d5f830610456b8e324216c91ddf30253c739a Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 16 May 2025 12:36:18 +0200 Subject: [PATCH 49/59] Updated dialog texts --- sbapp/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 8abc5bc..8e4a5cc 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -5480,10 +5480,10 @@ class SidebandApp(MDApp): info_str = "No keys known for the destination. Connected reticules have been queried for the keys. Try again when an announce for the destination has arrived." elif result == "in_progress": title_str = "Transfer In Progress" - info_str = "There is already a telemetry request transfer in progress for this peer." + info_str = "There is already a telemetry request transfer in progress to the collector." elif result == "sent": title_str = "Request Sent" - info_str = "A telemetry request was sent to the peer. The peer should send any available telemetry shortly." + info_str = "A telemetry request was sent to the collector. The collector should send any available telemetry shortly." elif result == "not_sent": title_str = "Not Sent" info_str = "A telemetry request could not be sent." From 668dd48cee135622a6d146cafa7ce42349d432a6 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Fri, 16 May 2025 12:50:38 +0200 Subject: [PATCH 50/59] Updated dependencies --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 4eb362f..022ba5e 100644 --- a/setup.py +++ b/setup.py @@ -115,7 +115,7 @@ setuptools.setup( }, install_requires=[ "rns>=0.9.6", - "lxmf>=0.7.0", + "lxmf>=0.7.1", "kivy>=2.3.0", "pillow>=10.2.0", "qrcode", From 3c03070b6ed1125d8360cfa98e877e11b20cf561 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sat, 17 May 2025 10:26:29 +0200 Subject: [PATCH 51/59] Added funding --- FUNDING.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 FUNDING.yml diff --git a/FUNDING.yml b/FUNDING.yml new file mode 100644 index 0000000..d125d55 --- /dev/null +++ b/FUNDING.yml @@ -0,0 +1,3 @@ +liberapay: Reticulum +ko_fi: markqvist +custom: "https://unsigned.io/donate" From aaed27d4ac65aefd2e583f2f417e6fcadadf2301 Mon Sep 17 00:00:00 2001 From: markqvist Date: Sat, 17 May 2025 20:37:55 +0200 Subject: [PATCH 52/59] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index cfb7fec..4bc11d3 100644 --- a/README.md +++ b/README.md @@ -323,6 +323,8 @@ You can help support the continued development of open, free and private communi ``` 0xae89F3B94fC4AD6563F0864a55F9a697a90261ff ``` +- Liberapay: https://liberapay.com/Reticulum/ + - Ko-Fi: https://ko-fi.com/markqvist From cd7562390c3d898985b84d1656b9c0462dccaaff Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 18 May 2025 18:03:25 +0200 Subject: [PATCH 53/59] Fixed incorrect widget ID. Closes #79. --- sbapp/ui/layouts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbapp/ui/layouts.py b/sbapp/ui/layouts.py index 48ff811..2f27bb7 100644 --- a/sbapp/ui/layouts.py +++ b/sbapp/ui/layouts.py @@ -653,7 +653,7 @@ MDScreen: height: dp(24) MDLabel: - id: connectivity_shared_label + id: connectivity_shared_access_label text: "Share Reticulum Instance" font_style: "H6" # disabled: True From e6ef41815cb9e830bf80ecfaa2895bb4a16639c7 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 13 Jul 2025 14:58:16 +0200 Subject: [PATCH 54/59] Updated dependencies --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 022ba5e..3d967c2 100644 --- a/setup.py +++ b/setup.py @@ -114,8 +114,8 @@ setuptools.setup( ] }, install_requires=[ - "rns>=0.9.6", - "lxmf>=0.7.1", + "rns>=1.0.0", + "lxmf>=0.8.0", "kivy>=2.3.0", "pillow>=10.2.0", "qrcode", From aee675d38b4c6ec13dcbd9afb66ad9e88ae67257 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Sun, 13 Jul 2025 14:58:24 +0200 Subject: [PATCH 55/59] Fixed missing widget hide --- sbapp/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbapp/main.py b/sbapp/main.py index 8e4a5cc..69658a0 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1,6 +1,6 @@ __debug_build__ = False __disable_shaders__ = False -__version__ = "1.6.1" +__version__ = "1.7.0" __variant__ = "" import sys @@ -3498,6 +3498,7 @@ class SidebandApp(MDApp): self.widget_hide(self.connectivity_screen.ids.connectivity_serial_label) self.widget_hide(self.connectivity_screen.ids.connectivity_use_serial) self.widget_hide(self.connectivity_screen.ids.connectivity_serial_fields) + self.widget_hide(self.connectivity_screen.ids.connectivity_share_instance) self.widget_hide(self.connectivity_screen.ids.connectivity_shared_access) self.widget_hide(self.connectivity_screen.ids.connectivity_shared_access_label) self.widget_hide(self.connectivity_screen.ids.connectivity_shared_access_fields) From 0d2f7b25a371aa079b7e0581bb2e38e9b87e63cb Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 14 Jul 2025 00:11:21 +0200 Subject: [PATCH 56/59] Added service restart --- sbapp/main.py | 76 +++++++++++++++++++++++++++++-- sbapp/services/sidebandservice.py | 3 ++ sbapp/ui/layouts.py | 17 +++++++ 3 files changed, 93 insertions(+), 3 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 69658a0..a238ad4 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -461,6 +461,67 @@ class SidebandApp(MDApp): argument = self.app_dir self.android_service.start(mActivity, argument) + def stop_service(self): + RNS.log("Stopping service...") + self.sideband.setstate("wants.service_stop", True) + while self.sideband.service_available(): time.sleep(0.2) + RNS.log("Service stopped") + + def restart_service_action(self, sender): + if hasattr(self, "service_restarting") and self.service_restarting == True: + toast(f"Service restart already in progress") + else: + toast(f"Restarting RNS service...") + if hasattr(self, "connectivity_screen") and self.connectivity_screen != None: + self.connectivity_screen.ids.button_service_restart.disabled = True + def job(): + if self.restart_service(): + def tj(delta_time): + toast(f"Service restarted successfully!") + if hasattr(self, "connectivity_screen") and self.connectivity_screen != None: + self.connectivity_screen.ids.button_service_restart.disabled = False + Clock.schedule_once(tj, 0.1) + else: + def tj(delta_time): + toast(f"Service restart failed") + if hasattr(self, "connectivity_screen") and self.connectivity_screen != None: + self.connectivity_screen.ids.button_service_restart.disabled = False + Clock.schedule_once(tj, 0.1) + + threading.Thread(target=job, daemon=True).start() + + def restart_service(self): + if hasattr(self, "service_restarting") and self.service_restarting == True: + return False + else: + self.service_restarting = True + self.stop_service() + RNS.log("Waiting for service shutdown", RNS.LOG_DEBUG) + while self.sideband.service_rpc_request({"getstate": "service.heartbeat"}): + time.sleep(1) + time.sleep(4) + + self.final_load_completed = False + self.sideband.service_stopped = True + + RNS.log("Starting service...", RNS.LOG_DEBUG) + self.start_service() + RNS.log("Waiting for service restart...", RNS.LOG_DEBUG) + restart_timeout = time.time() + 45 + while not self.sideband.service_rpc_request({"getstate": "service.heartbeat"}): + self.sideband.rpc_connection = None + time.sleep(1) + if time.time() > restart_timeout: + service_restarting = False + return False + + RNS.log("Service restarted", RNS.LOG_DEBUG) + self.sideband.service_stopped = False + self.final_load_completed = True + self.service_restarting = False + + return True + def start_final(self): # Start local core instance self.sideband.start() @@ -1098,19 +1159,28 @@ class SidebandApp(MDApp): description = rnode_errors["description"] self.sideband.setpersistent("runtime.errors.rnode", None) yes_button = MDRectangleFlatButton( - text="OK", + text="Ignore", + font_size=dp(18), + ) + restart_button = MDRectangleFlatButton( + text="Restart RNS", font_size=dp(18), ) self.hw_error_dialog = MDDialog( title="Hardware Error", text="While communicating with an RNode, Reticulum reported the following error:\n\n[i]"+str(description)+"[/i]", - buttons=[ yes_button ], + buttons=[ yes_button, restart_button ], # elevation=0, ) def dl_yes(s): self.hw_error_dialog.dismiss() self.hw_error_dialog.is_open = False + def dl_restart(s): + self.hw_error_dialog.dismiss() + self.hw_error_dialog.is_open = False + self.restart_service_action(None) yes_button.bind(on_release=dl_yes) + restart_button.bind(on_release=dl_restart) self.hw_error_dialog.open() self.hw_error_dialog.is_open = True @@ -3659,7 +3729,7 @@ class SidebandApp(MDApp): else: info = "By default, Sideband will try to discover and connect to any available Reticulum networks via active WiFi and/or Ethernet interfaces. If any Reticulum Transport Instances are found, Sideband will use these to connect to wider Reticulum networks. You can disable this behaviour if you don't want it.\n\n" info += "You can also connect to a network via a remote or local Reticulum instance using TCP or I2P. [b]Please Note![/b] Connecting via I2P requires that you already have I2P running on your device, and that the SAM API is enabled.\n\n" - info += "For changes to connectivity to take effect, you must shut down and restart Sideband.\n" + info += "For changes to connectivity to take effect, you must either restart the RNS service, or completely shut down and restart Sideband.\n" self.connectivity_screen.ids.connectivity_info.text = info self.connectivity_screen.ids.connectivity_use_local.active = self.sideband.config["connect_local"] diff --git a/sbapp/services/sidebandservice.py b/sbapp/services/sidebandservice.py index e718a6f..814c2b6 100644 --- a/sbapp/services/sidebandservice.py +++ b/sbapp/services/sidebandservice.py @@ -481,6 +481,9 @@ class SidebandService(): self.sideband.cleanup() self.release_locks() + # TODO: Check if this works in all cases + self.android_service.stopSelf() + def handle_exception(exc_type, exc_value, exc_traceback): if issubclass(exc_type, KeyboardInterrupt): sys.__excepthook__(exc_type, exc_value, exc_traceback) diff --git a/sbapp/ui/layouts.py b/sbapp/ui/layouts.py index 2f27bb7..fc4d9e0 100644 --- a/sbapp/ui/layouts.py +++ b/sbapp/ui/layouts.py @@ -360,6 +360,23 @@ MDScreen: text_size: self.width, None height: self.texture_size[1] + MDBoxLayout: + id: connectivity_shared_access_fields + orientation: "vertical" + size_hint_y: None + height: self.minimum_height + padding: [0, 0, 0, dp(32)] + + MDRectangleFlatIconButton: + id: button_service_restart + icon: "restart" + text: "Restart RNS Service" + padding: [dp(0), dp(14), dp(0), dp(14)] + icon_size: dp(24) + font_size: dp(16) + size_hint: [1.0, None] + on_release: root.app.restart_service_action(self) + MDBoxLayout: orientation: "horizontal" padding: [0,0,dp(24),0] From 73601ebe1e040b90d9f3431d97a8fe7b3a2615fb Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 14 Jul 2025 16:06:50 +0200 Subject: [PATCH 57/59] Added in-app BLE scanning and pairing --- sbapp/main.py | 122 ++++++++++++++++++++++++++++++++++++++++++++ sbapp/ui/layouts.py | 86 +++++++++++++++++++++++++++---- 2 files changed, 197 insertions(+), 11 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index a238ad4..5787300 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -277,6 +277,9 @@ else: from kivymd.utils.set_bars_colors import set_bars_colors android_api_version = autoclass('android.os.Build$VERSION').SDK_INT + from android.broadcast import BroadcastReceiver + BluetoothAdapter = autoclass('android.bluetooth.BluetoothAdapter') + else: from .sideband.core import SidebandCore import sbapp.plyer as plyer @@ -408,6 +411,9 @@ class SidebandApp(MDApp): self.repository_url = None self.rnode_flasher_url = None + self.bt_adapter = None + self.discovered_bt_devices = {} + self.bt_bonded_devices = [] ################################################# # Application Startup # @@ -1008,6 +1014,65 @@ class SidebandApp(MDApp): self.check_bluetooth_permissions() + def bluetooth_update_bonded_devices(self, sender=None): + if self.bt_adapter == None: self.bt_adapter = BluetoothAdapter.getDefaultAdapter() + self.bt_bonded_devices = [] + for device in self.bt_adapter.getBondedDevices(): + device_addr = device.getAddress() + self.bt_bonded_devices.append(device_addr) + + RNS.log(f"Updated bonded devices: {self.bt_bonded_devices}", RNS.LOG_DEBUG) + + def bluetooth_scan_action(self, sender=None): + toast("Starting Bluetooth scan...") + self.start_bluetooth_scan() + + def start_bluetooth_scan(self): + self.check_bluetooth_permissions() + if not self.sideband.getpersistent("permissions.bluetooth"): + self.request_bluetooth_permissions() + else: + RNS.log("Starting bluetooth scan", RNS.LOG_DEBUG) + self.discovered_bt_devices = {} + + BluetoothDevice = autoclass('android.bluetooth.BluetoothDevice') + self.bt_found_action = BluetoothDevice.ACTION_FOUND + self.broadcast_receiver = BroadcastReceiver(self.on_broadcast, actions=[self.bt_found_action]) + self.broadcast_receiver.start() + + self.bt_adapter = BluetoothAdapter.getDefaultAdapter() + self.bluetooth_update_bonded_devices() + self.bt_adapter.startDiscovery() + + def stop_bluetooth_scan(self): + RNS.log("Stopping bluetooth scan", RNS.LOG_DEBUG) + self.check_bluetooth_permissions() + if not self.sideband.getpersistent("permissions.bluetooth"): + self.request_bluetooth_permissions() + else: + self.bt_adapter = BluetoothAdapter.getDefaultAdapter() + self.bt_adapter.cancelDiscovery() + + def on_broadcast(self, context, intent): + BluetoothDevice = autoclass('android.bluetooth.BluetoothDevice') + action = intent.getAction() + extras = intent.getExtras() + + if str(action) == "android.bluetooth.device.action.FOUND": + if extras: + try: + device = intent.getParcelableExtra("android.bluetooth.device.extra.DEVICE", BluetoothDevice) + dev_name = device.getName() + dev_addr = device.getAddress() + if dev_name.startswith("RNode "): + dev_rssi = extras.getShort("android.bluetooth.device.extra.RSSI", -9999) + discovered_device = {"name": dev_name, "address": dev_addr, "rssi": dev_rssi, "discovered": time.time()} + self.discovered_bt_devices[dev_addr] = discovered_device + RNS.log(f"Discovered RNode: {discovered_device}", RNS.LOG_DEBUG) + + except Exception as e: + RNS.log(f"Error while mapping discovered device: {e}", RNS.LOG_ERROR) + def on_new_intent(self, intent): intent_action = intent.getAction() action = None @@ -4250,6 +4315,63 @@ class SidebandApp(MDApp): self.sideband.save_configuration() + def hardware_rnode_scan_job(self): + time.sleep(1.25) + added_devices = [] + scan_timeout = time.time()+16 + while time.time() < scan_timeout: + RNS.log("Scanning...", RNS.LOG_DEBUG) + for device_addr in self.discovered_bt_devices: + if device_addr not in added_devices and not device_addr in self.bt_bonded_devices: + new_device = self.discovered_bt_devices[device_addr] + added_devices.append(device_addr) + RNS.log(f"Adding device: {new_device}") + def add_factory(add_device): + def add_job(dt): + pair_addr = add_device["address"] + btn_text = "Pair "+add_device["name"] + def run_pair(sender): self.hardware_rnode_pair_device_action(pair_addr) + # device_button = MDRectangleFlatButton(text=btn_text,font_size=dp(16)) + device_button = MDRectangleFlatButton(text=btn_text, font_size=dp(16), padding=[dp(0), dp(14), dp(0), dp(14)], size_hint=[1.0, None]) + device_button.bind(on_release=run_pair) + self.hardware_rnode_screen.ids.rnode_scan_results.add_widget(device_button) + return add_job + + Clock.schedule_once(add_factory(new_device), 0.1) + + time.sleep(2) + + def job(dt): + self.hardware_rnode_screen.ids.hardware_rnode_bt_scan_button.disabled = False + self.hardware_rnode_screen.ids.hardware_rnode_bt_scan_button.text = "Pair New Device" + Clock.schedule_once(job, 0.2) + + if len(added_devices) == 0: + def job(dt): toast("No unpaired RNodes discovered") + Clock.schedule_once(job, 0.2) + + def hardware_rnode_pair_device_action(self, pair_addr): + RNS.log(f"Pair action for {pair_addr}", RNS.LOG_DEBUG) + self.stop_bluetooth_scan() + BluetoothSocket = autoclass('android.bluetooth.BluetoothSocket') + if self.bt_adapter == None: self.bt_adapter = BluetoothAdapter.getDefaultAdapter() + addr_bytes = bytes.fromhex(pair_addr.replace(":", "")) + remote_device = self.bt_adapter.getRemoteDevice(addr_bytes) + RNS.log(f"Remote device: {remote_device}", RNS.LOG_DEBUG) + remote_device.createBond() + RNS.log("Create bond call returned", RNS.LOG_DEBUG) + + def hardware_rnode_bt_scan_action(self, sender=None): + self.discovered_bt_devices = {} + self.hardware_rnode_screen.ids.hardware_rnode_bt_scan_button.disabled = True + self.hardware_rnode_screen.ids.hardware_rnode_bt_scan_button.text = "Scanning..." + rw = [] + for child in self.hardware_rnode_screen.ids.rnode_scan_results.children: rw.append(child) + for w in rw: self.hardware_rnode_screen.ids.rnode_scan_results.remove_widget(w) + + Clock.schedule_once(self.bluetooth_scan_action, 0.5) + threading.Thread(target=self.hardware_rnode_scan_job, daemon=True).start() + def hardware_rnode_bt_on_action(self, sender=None): self.hardware_rnode_screen.ids.hardware_rnode_bt_pair_button.disabled = True self.hardware_rnode_screen.ids.hardware_rnode_bt_on_button.disabled = True diff --git a/sbapp/ui/layouts.py b/sbapp/ui/layouts.py index fc4d9e0..08f0b5d 100644 --- a/sbapp/ui/layouts.py +++ b/sbapp/ui/layouts.py @@ -2400,7 +2400,7 @@ MDScreen: spacing: "24dp" size_hint_y: None height: self.minimum_height - padding: [dp(0), dp(0), dp(0), dp(35)] + padding: [dp(0), dp(0), dp(0), dp(48)] MDRectangleFlatIconButton: id: rnode_mote_export @@ -2423,7 +2423,7 @@ MDScreen: on_release: root.app.hardware_rnode_import(self) MDLabel: - text: "Radio Options" + text: "Radio Options\\n" font_style: "H6" # MDTextField: @@ -2522,8 +2522,8 @@ MDScreen: MDBoxLayout: orientation: "horizontal" size_hint_y: None - padding: [0,0,dp(24),dp(0)] - height: dp(48) + padding: [0,dp(14),dp(24),dp(48)] + height: dp(86) MDLabel: text: "Control RNode Display" @@ -2534,6 +2534,18 @@ MDScreen: pos_hint: {"center_y": 0.3} active: False + MDLabel: + text: "Bluetooth Settings\\n" + font_style: "H6" + + MDLabel: + id: hardware_rnode_info + markup: True + text: "If you enable connection via Bluetooth, Sideband will attempt to connect to any available and paired RNodes over Bluetooth. If your RNode uses BLE (ESP32-S3 and nRF devices) instead of classic Bluetooth, enable the [i]Device requires BLE[/i] option as well." + size_hint_y: None + text_size: self.width, None + height: self.texture_size[1] + MDBoxLayout: orientation: "horizontal" size_hint_y: None @@ -2567,7 +2579,65 @@ MDScreen: MDLabel: id: hardware_rnode_info markup: True - text: "If you enable connection via Bluetooth, Sideband will attempt to connect to any available and paired RNodes over Bluetooth.\\n\\nYou must first pair the RNode with your device for this to work. If your RNode does not have a physical pairing button, you can enable Bluetooth and put it into pairing mode by first connecting it via a USB cable, and using the buttons below. When plugging in the RNode over USB, you must grant Sideband permission to the USB device for this to work.\\n\\nYou can also change Bluetooth settings using the \\"rnodeconf\\" utility from a computer.\\n\\nBy default, Sideband will connect to the first available RNode that is paired. If you want to always use a specific RNode, you can enter its name in the Preferred RNode Device Name field below, for example \\"RNode A8EB\\".\\n" + text: "You must first pair the RNode with your device for this to work. To put an RNode into pairing mode, hold down the multi-function user button for more than 5 seconds, and release it. The display will indicate pairing mode.You can then pair the device using the Bluetooth settings of your device, or by pressing the pairing button below.\\n" + size_hint_y: None + text_size: self.width, None + height: self.texture_size[1] + + MDBoxLayout: + orientation: "vertical" + spacing: "24dp" + size_hint_y: None + height: self.minimum_height + padding: [dp(0), dp(0), dp(0), dp(12)] + + MDRectangleFlatIconButton: + id: hardware_rnode_bt_scan_button + icon: "bluetooth-connect" + text: "Pair New Device" + padding: [dp(0), dp(14), dp(0), dp(14)] + icon_size: dp(24) + font_size: dp(16) + size_hint: [1.0, None] + on_release: root.app.hardware_rnode_bt_scan_action(self) + + MDBoxLayout: + id: rnode_scan_results + orientation: "vertical" + spacing: "24dp" + size_hint_y: None + height: self.minimum_height + padding: [dp(0), dp(0), dp(0), dp(12)] + + MDLabel: + id: hardware_rnode_info + markup: True + text: "By default, Sideband will connect to the first available RNode that is paired. If you want to always use a specific RNode, you can enter its name in the Preferred RNode Device Name field below, for example \\"RNode A8EB\\"." + size_hint_y: None + text_size: self.width, None + height: self.texture_size[1] + + MDBoxLayout: + orientation: "vertical" + spacing: "24dp" + size_hint_y: None + height: self.minimum_height + # padding: [dp(0), dp(0), dp(0), dp(35)] + + MDTextField: + id: hardware_rnode_bt_device + hint_text: "Preferred RNode Device Name" + text: "" + font_size: dp(24) + + MDLabel: + text: "\\n\\nDevice Bluetooth Control\\n" + font_style: "H6" + + MDLabel: + id: hardware_rnode_info + markup: True + text: "\\n\\nIf your RNode does not have a physical pairing button, you can enable Bluetooth and put it into pairing mode by first connecting it via a USB cable, and using the buttons below. When plugging in the RNode over USB, you must grant Sideband permission to the USB device for this to work.\\n\\nYou can also change Bluetooth settings using the \\"rnodeconf\\" utility from a computer.\\n" size_hint_y: None text_size: self.width, None height: self.texture_size[1] @@ -2610,12 +2680,6 @@ MDScreen: size_hint: [1.0, None] on_release: root.app.hardware_rnode_bt_pair_action(self) disabled: False - - MDTextField: - id: hardware_rnode_bt_device - hint_text: "Preferred RNode Device Name" - text: "" - font_size: dp(24) """ layout_hardware_serial_screen = """ From f0ec8fde4236a2fc4261759c706501b223940768 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 14 Jul 2025 20:37:58 +0200 Subject: [PATCH 58/59] Updated bluetooth scanning text --- sbapp/main.py | 3 ++- sbapp/ui/layouts.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sbapp/main.py b/sbapp/main.py index 5787300..aa13885 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -1061,7 +1061,8 @@ class SidebandApp(MDApp): if str(action) == "android.bluetooth.device.action.FOUND": if extras: try: - device = intent.getParcelableExtra("android.bluetooth.device.extra.DEVICE", BluetoothDevice) + if android_api_version < 33: device = intent.getParcelableExtra("android.bluetooth.device.extra.DEVICE") + else: device = intent.getParcelableExtra("android.bluetooth.device.extra.DEVICE", BluetoothDevice) dev_name = device.getName() dev_addr = device.getAddress() if dev_name.startswith("RNode "): diff --git a/sbapp/ui/layouts.py b/sbapp/ui/layouts.py index 08f0b5d..a29b580 100644 --- a/sbapp/ui/layouts.py +++ b/sbapp/ui/layouts.py @@ -2579,7 +2579,7 @@ MDScreen: MDLabel: id: hardware_rnode_info markup: True - text: "You must first pair the RNode with your device for this to work. To put an RNode into pairing mode, hold down the multi-function user button for more than 5 seconds, and release it. The display will indicate pairing mode.You can then pair the device using the Bluetooth settings of your device, or by pressing the pairing button below.\\n" + text: "You must first pair the RNode with your device for this to work. To put an RNode into pairing mode, hold down the multi-function user button for more than 5 seconds, and release it. The display will indicate pairing mode.You can then pair the device using the Bluetooth settings of your device, or by pressing the pairing button below. The in-app scanning and pairing is supported on Android 12+. If it doesn't work, use the Bluetooth settings of your device to scan and pair.\\n" size_hint_y: None text_size: self.width, None height: self.texture_size[1] From 354fb08297835eab04ac69d15081a18baf0583ac Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Mon, 14 Jul 2025 21:35:58 +0200 Subject: [PATCH 59/59] Cleanup --- sbapp/main.py | 1 + sbapp/ui/layouts.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sbapp/main.py b/sbapp/main.py index aa13885..46e7d0b 100644 --- a/sbapp/main.py +++ b/sbapp/main.py @@ -3642,6 +3642,7 @@ class SidebandApp(MDApp): self.widget_hide(self.connectivity_screen.ids.connectivity_enable_transport) self.widget_hide(self.connectivity_screen.ids.connectivity_transport_info) self.widget_hide(self.connectivity_screen.ids.connectivity_transport_fields) + self.widget_hide(self.connectivity_screen.ids.connectivity_service_restart_fields) def con_collapse_local(collapse=True): # self.widget_hide(self.connectivity_screen.ids.connectivity_local_fields, collapse) diff --git a/sbapp/ui/layouts.py b/sbapp/ui/layouts.py index a29b580..f144eb5 100644 --- a/sbapp/ui/layouts.py +++ b/sbapp/ui/layouts.py @@ -361,7 +361,7 @@ MDScreen: height: self.texture_size[1] MDBoxLayout: - id: connectivity_shared_access_fields + id: connectivity_service_restart_fields orientation: "vertical" size_hint_y: None height: self.minimum_height