Git-Mirrors/Sideband
1
0
Fork 0
mirror of https://github.com/markqvist/Sideband.git synced 2024-12-26 07:59:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed stamp generation status not being displayed in some cases

Browse Source
This commit is contained in:
Mark Qvist 2024-10-13 14:37:45 +02:00
parent 8a8d2a77c3
commit 046cbbc30c
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbapp/main.py
View File

@ -1,6 +1,6 @@
__debug_build__ = False __debug_build__ = False
__disable_shaders__ = False __disable_shaders__ = False
__version__ = "1.1.2" __version__ = "1.1.3"
__variant__ = "" __variant__ = ""
import sys import sys

38
sbapp/sideband/core.py
View File

@ -1756,6 +1756,9 @@ class SidebandCore():
elif "get_lxm_progress" in call: elif "get_lxm_progress" in call:
args = call["get_lxm_progress"] args = call["get_lxm_progress"]
connection.send(self.get_lxm_progress(args["lxm_hash"])) connection.send(self.get_lxm_progress(args["lxm_hash"]))
elif "get_lxm_stamp_cost" in call:
args = call["get_lxm_stamp_cost"]
connection.send(self.get_lxm_stamp_cost(args["lxm_hash"]))
else: else:
connection.send(None) connection.send(None)
@ -4030,12 +4033,37 @@ class SidebandCore():
RNS.log("An error occurred while getting message transfer progress: "+str(e), RNS.LOG_ERROR) RNS.log("An error occurred while getting message transfer progress: "+str(e), RNS.LOG_ERROR)
return None return None
def _service_get_lxm_stamp_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_stamp_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_stamp_cost(self, lxm_hash): def get_lxm_stamp_cost(self, lxm_hash):
try: if self.allow_service_dispatch and self.is_client:
return self.message_router.get_outbound_lxm_stamp_cost(lxm_hash) try:
except Exception as e: return self._service_get_lxm_stamp_cost(lxm_hash)
RNS.log("An error occurred while getting message transfer stamp cost: "+str(e), RNS.LOG_ERROR)
return None 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_stamp_cost(lxm_hash)
except Exception as e:
RNS.log("An error occurred while getting message transfer stamp cost: "+str(e), RNS.LOG_ERROR)
return None
def _service_send_message(self, content, destination_hash, propagation, skip_fields=False, no_display=False, attachment = None, image = None, audio = None): def _service_send_message(self, content, destination_hash, propagation, skip_fields=False, no_display=False, attachment = None, image = None, audio = None):
if not RNS.vendor.platformutils.is_android(): if not RNS.vendor.platformutils.is_android():