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

Improved exit behaviour on Android. Closes #8.

Browse Source
This commit is contained in:
Mark Qvist 2022-10-19 17:53:26 +02:00
parent 21b35eb606
commit b432646c30
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbapp/main.py
View File

@ -474,10 +474,15 @@ class SidebandApp(MDApp):
while self.sideband.service_available(): while self.sideband.service_available():
time.sleep(0.2) time.sleep(0.2)
RNS.log("Service stopped") RNS.log("Service stopped")
RNS.exit() if RNS.vendor.platformutils.is_android():
MDApp.get_running_app().stop() RNS.log("Finishing activity")
Window.close() activity = autoclass('org.kivy.android.PythonActivity').mActivity
activity.finishAndRemoveTask()
else:
RNS.exit()
MDApp.get_running_app().stop()
Window.close()
Clock.schedule_once(final_exit, 0.65) Clock.schedule_once(final_exit, 0.65)
@ -712,6 +717,7 @@ class SidebandApp(MDApp):
yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18)) yes_button = MDRectangleFlatButton(text="OK",font_size=dp(18))
dialog = MDDialog( dialog = MDDialog(
title="Can't Sync",
text="No active LXMF propagation nodes were found. Cannot fetch messages. Wait for a Propagation Node to announce on the network, or manually specify one in the settings.", text="No active LXMF propagation nodes were found. Cannot fetch messages. Wait for a Propagation Node to announce on the network, or manually specify one in the settings.",
buttons=[ yes_button ], buttons=[ yes_button ],
# elevation=0, # elevation=0,