Fixed stamp generation status not being displayed in some cases

markqvist · Oct 13, 2024 · 046cbbc · 046cbbc
1 parent 8a8d2a7
commit 046cbbc
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/sbapp/main.py b/sbapp/main.py
@@ -1,6 +1,6 @@
 __debug_build__ = False
 __disable_shaders__ = False
-__version__ = "1.1.2"
+__version__ = "1.1.3"
 __variant__ = ""
 
 import sys

diff --git a/sbapp/sideband/core.py b/sbapp/sideband/core.py
@@ -1756,6 +1756,9 @@ def rpc_client_job():
                                 elif "get_lxm_progress" in call:
                                     args = call["get_lxm_progress"]
                                     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:
                                     connection.send(None)
 
@@ -4030,12 +4033,37 @@ def get_lxm_progress(self, lxm_hash):
             RNS.log("An error occurred while getting message transfer progress: "+str(e), RNS.LOG_ERROR)
             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):
-        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
+        if self.allow_service_dispatch and self.is_client:
+            try:
+                return self._service_get_lxm_stamp_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_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):
         if not RNS.vendor.platformutils.is_android():