jacob.eva/openCom-Companion
1
0
Fork 0
mirror of https://github.com/liberatedsystems/openCom-Companion.git synced 2024-11-24 22:30:37 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated release compatibility with RNS 0.3.9

Browse Source
This commit is contained in:
Mark Qvist 2022-07-05 15:22:11 +02:00
parent 4d7d08410a
commit 33d31b453f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -23,7 +23,7 @@ apk: prepare release postbuild
devapk: prepare debug postbuild devapk: prepare debug postbuild
install: install:
adb install bin/sideband-0.0.1-arm64-v8a-debug.apk adb install bin/sideband-0.1.4-arm64-v8a-debug.apk
console: console:
(adb logcat | grep python) (adb logcat | grep python)

22
sideband/core.py
View File

@ -692,6 +692,14 @@ class SidebandCore():
self.rns_dir = RNS.Reticulum.configdir self.rns_dir = RNS.Reticulum.configdir
if self.config["lxmf_propagation_node"] != None and self.config["lxmf_propagation_node"] != "":
self.set_active_propagation_node(self.config["lxmf_propagation_node"])
else:
if self.config["last_lxmf_propagation_node"] != None and self.config["last_lxmf_propagation_node"] != "":
self.set_active_propagation_node(self.config["last_lxmf_propagation_node"])
else:
self.set_active_propagation_node(None)
def message_notification(self, message): def message_notification(self, message):
if message.state == LXMF.LXMessage.FAILED and hasattr(message, "try_propagation_on_fail") and message.try_propagation_on_fail: if message.state == LXMF.LXMessage.FAILED and hasattr(message, "try_propagation_on_fail") and message.try_propagation_on_fail:
RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE) RNS.log("Direct delivery of "+str(message)+" failed. Retrying as propagated message.", RNS.LOG_VERBOSE)
@ -768,10 +776,10 @@ class SidebandCore():
context_dest = message.source_hash context_dest = message.source_hash
if self._db_message(message.hash): if self._db_message(message.hash):
RNS.log("Message exists, setting state to: "+str(message.state)) RNS.log("Message exists, setting state to: "+str(message.state), RNS.LOG_DEBUG)
self._db_message_set_state(message.hash, message.state) self._db_message_set_state(message.hash, message.state)
else: else:
RNS.log("Message does not exist, saving") RNS.log("Message does not exist, saving", RNS.LOG_DEBUG)
self._db_save_lxm(message, context_dest) self._db_save_lxm(message, context_dest)
if self._db_conversation(context_dest) == None: if self._db_conversation(context_dest) == None:
@ -796,14 +804,6 @@ class SidebandCore():
self._db_clean_messages() self._db_clean_messages()
self.__start_jobs_immediate() self.__start_jobs_immediate()
if self.config["lxmf_propagation_node"] != None and self.config["lxmf_propagation_node"] != "":
self.set_active_propagation_node(self.config["lxmf_propagation_node"])
else:
if self.config["last_lxmf_propagation_node"] != None and self.config["last_lxmf_propagation_node"] != "":
self.set_active_propagation_node(self.config["last_lxmf_propagation_node"])
else:
self.set_active_propagation_node(None)
thread = threading.Thread(target=self.__start_jobs_deferred) thread = threading.Thread(target=self.__start_jobs_deferred)
thread.setDaemon(True) thread.setDaemon(True)
thread.start() thread.start()
@ -879,7 +879,7 @@ instance_control_port = 37429
panic_on_interface_error = No panic_on_interface_error = No
[logging] [logging]
loglevel = 7 loglevel = 3
[interfaces] [interfaces]
[[Default Interface]] [[Default Interface]]