Mirrors
/
Sideband
mirror of https://github.com/markqvist/Sideband.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added error message on service error or crash. Added error message on USB control connection errors.

This commit is contained in:
Mark Qvist 2022-12-15 17:01:34 +01:00
parent 49a55b7094
commit b3e403de40
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbapp/sideband/core.py
View File

@ -449,9 +449,6 @@ class SidebandCore():
self.config["last_lxmf_propagation_node"] = dest self.config["last_lxmf_propagation_node"] = dest
self.message_router.set_outbound_propagation_node(dest) self.message_router.set_outbound_propagation_node(dest)
if not self.is_service:
self.owner_app.root.ids.settings_propagation_node_address.text = RNS.hexrep(dest, delimit=False)
RNS.log("Active propagation node set to: "+RNS.prettyhexrep(dest)) RNS.log("Active propagation node set to: "+RNS.prettyhexrep(dest))
self.__save_config() self.__save_config()
except Exception as e: except Exception as e:
@ -1297,8 +1294,11 @@ class SidebandCore():
else: else:
if hasattr(self.owner_app, "usb_devices") and self.owner_app.usb_devices != None: if hasattr(self.owner_app, "usb_devices") and self.owner_app.usb_devices != None:
if len(self.owner_app.usb_devices) > 0: if len(self.owner_app.usb_devices) > 0:
target_port = self.owner_app.usb_devices[0]["port"] try:
RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, pairing_mode = True) target_port = self.owner_app.usb_devices[0]["port"]
RNS.Interfaces.Android.RNodeInterface.RNodeInterface.bluetooth_control(port=target_port, pairing_mode = True)
except Exception as e:
self.setstate("hardware_operation.error", "An error ocurred while trying to communicate with the device. Please make sure that Sideband has been granted permissions to access the device.\n\nThe reported error was:\n\n[i]"+str(e)+"[/i]")
else: else:
RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR) RNS.log("Could not execute RNode Bluetooth control command, no USB devices available", RNS.LOG_ERROR)
self.setstate("executing.bt_pair", False) self.setstate("executing.bt_pair", False)
@ -1630,6 +1630,8 @@ class SidebandCore():
if self.interface_rnode.online: if self.interface_rnode.online:
self.interface_rnode.display_image(sideband_fb_data) self.interface_rnode.display_image(sideband_fb_data)
self.interface_rnode.enable_external_framebuffer() self.interface_rnode.enable_external_framebuffer()
else:
self.interface_rnode.last_imagedata = sideband_fb_data
except Exception as e: except Exception as e:
RNS.log("Error while adding RNode Interface. The contained exception was: "+str(e)) RNS.log("Error while adding RNode Interface. The contained exception was: "+str(e))