Git-Mirrors/Sideband
1
0
Fork 0
mirror of https://github.com/markqvist/Sideband.git synced 2025-11-09 10:45:04 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates for LXMF 0.9.0 compatibility

Browse source
This commit is contained in:
Mark Qvist 2025-10-31 22:28:08 +01:00
parent 2758b571ff
commit 6802161b4f
3 changed files with 54 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

41
sbapp/sideband/core.py
View file

@ -53,7 +53,7 @@ class PropagationNodeDetector():
if app_data != None and len(app_data) > 0:
if pn_announce_data_is_valid(app_data):
unpacked = msgpack.unpackb(app_data)
node_active = unpacked[0]
node_active = unpacked[2]
emitted = unpacked[1]
hops = RNS.Transport.hops_to(destination_hash)
@ -67,10 +67,8 @@ class PropagationNodeDetector():
# age = 0
pass
if self.owner_app != None:
stat_endpoint = self.owner_app.sideband
else:
stat_endpoint = self.owner
if self.owner_app != None: stat_endpoint = self.owner_app.sideband
else: stat_endpoint = self.owner
link_stats = {"rssi": stat_endpoint.reticulum.get_packet_rssi(announce_packet_hash),
"snr": stat_endpoint.reticulum.get_packet_snr(announce_packet_hash),
@ -2126,6 +2124,9 @@ class SidebandCore():
elif "get_lxm_stamp_cost" in call:
args = call["get_lxm_stamp_cost"]
connection.send(self.get_lxm_stamp_cost(args["lxm_hash"]))
elif "get_lxm_propagation_cost" in call:
args = call["get_lxm_propagation_cost"]
connection.send(self.get_lxm_propagation_cost(args["lxm_hash"]))
elif "is_tracking" in call:
connection.send(self.is_tracking(call["is_tracking"]))
elif "start_tracking" in call:
@ -2808,8 +2809,8 @@ class SidebandCore():
announced_name = LXMF.display_name_from_app_data(app_data)
announced_cost = self.message_router.get_outbound_stamp_cost(entry[2])
else:
announced_name = None
announced_cost = None
announced_name = LXMF.pn_name_from_app_data(app_data)
announced_cost = LXMF.pn_stamp_cost_from_app_data(app_data)
announce = {
"dest" : entry[2],
"name" : announced_name,
@ -4643,6 +4644,32 @@ class SidebandCore():
RNS.log("An error occurred while getting message transfer stamp cost: "+str(e), RNS.LOG_ERROR)
return None
def _service_get_lxm_propagation_cost(self, lxm_hash):
if not RNS.vendor.platformutils.is_android(): return False
else:
if self.is_client:
try: return self.service_rpc_request({"get_lxm_propagation_cost": { "lxm_hash": lxm_hash } })
except Exception as e:
RNS.log("Error while sending message over RPC: "+str(e), RNS.LOG_DEBUG)
RNS.trace_exception(e)
return False
else: return False
def get_lxm_propagation_cost(self, lxm_hash):
if self.allow_service_dispatch and self.is_client:
try: return self._service_get_lxm_propagation_cost(lxm_hash)
except Exception as e:
RNS.log("Error while getting message transfer stamp cost: "+str(e), RNS.LOG_ERROR)
RNS.trace_exception(e)
return False
else:
try: return self.message_router.get_outbound_lxm_propagation_stamp_cost(lxm_hash)
except Exception as e:
RNS.log("An error occurred while getting message propagation stamp cost: "+str(e), RNS.LOG_ERROR)
return None
def _service_cancel_message(self, message_id):
if not RNS.vendor.platformutils.is_android():
return False

15
sbapp/ui/announces.py
View file

@ -127,7 +127,16 @@ class Announces():
ad_text = "[size=22dp]LXMF Peer[/size]\n\n[b]Received[/b] "+ts+"\n[b]Address[/b] "+RNS.prettyhexrep(dest)+"\n[b]Name[/b] "+name+"\n[b]Stamp Cost[/b] "+cost+link_extras
if dtype == "lxmf.propagation":
ad_text = "[size=22dp]LXMF Propagation Node[/size]\n\n[b]Received[/b] "+ts+"\n[b]Address[/b] "+RNS.prettyhexrep(dest)+link_extras
if a_name:
disp_name = multilingual_markup(escape_markup(str(a_name)).encode("utf-8")).decode("utf-8")
disp_name = f"\n[b]Name[/b] {disp_name}"
else: disp_name = ""
if a_cost:
disp_cost = str(a_cost)
disp_cost = f"\n[b]Stamp Cost[/b] {disp_cost}"
else: disp_cost = ""
ad_text = f"[size=22dp]LXMF Propagation Node[/size]\n\n[b]Received[/b] {ts}\n[b]Address[/b] {RNS.prettyhexrep(dest)+link_extras}{disp_name}{disp_cost}"
dialog = MDDialog(
text=ad_text,
@ -150,7 +159,9 @@ class Announces():
iconl = IconLeftWidget(icon=trust_icon)
elif dest_type == "lxmf.propagation":
disp_name = "Propagation Node "+RNS.prettyhexrep(context_dest)
if a_name: disp_name = multilingual_markup(escape_markup(str(a_name)).encode("utf-8")).decode("utf-8")
else: disp_name = f"Propagation Node"
disp_name = f"{disp_name} {RNS.prettyhexrep(context_dest)}"
iconl = IconLeftWidget(icon="upload-network")
else:

7
sbapp/ui/messages.py
View file

@ -336,9 +336,16 @@ class Messages():
prgstr = ", "+str(round(prg*100, 1))+"% done"
if prg <= 0.00:
stamp_cost = self.app.sideband.get_lxm_stamp_cost(msg["hash"])
prop_cost = self.app.sideband.get_lxm_propagation_cost(msg["hash"])
if stamp_cost:
sphrase = f"Generating stamp with cost {stamp_cost}"
prgstr = ""
elif prop_cost:
sphrase = f"Generating propagation stamp with cost {prop_cost}"
prgstr = ""
elif stamp_cost and prop_cost:
sphrase = f"Generating stamps with cost {stamp_cost} and {prop_cost}"
prgstr = ""
else:
sphrase = "Waiting for path"
elif prg <= 0.01: