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

Disable notifications in daemon mode

Browse Source
This commit is contained in:
Mark Qvist 2024-03-27 18:41:04 +01:00
parent 6700b7f8b7
commit 72e11fd859
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbapp/main.py
View File

@ -4967,7 +4967,7 @@ if not args.daemon:
def run(): def run():
if args.daemon: if args.daemon:
RNS.log("Starting Sideband in daemon mode") RNS.log("Starting Sideband in daemon mode")
sideband = SidebandCore(None, is_client=False, verbose=(args.verbose or __debug_build__)) sideband = SidebandCore(None, is_client=False, verbose=(args.verbose or __debug_build__), is_daemon=True)
sideband.start() sideband.start()
while True: while True:
time.sleep(5) time.sleep(5)

32
sbapp/sideband/core.py
View File

@ -106,9 +106,10 @@ class SidebandCore():
# stream logger # stream logger
self.log_announce(destination_hash, app_data, dest_type=SidebandCore.aspect_filter) self.log_announce(destination_hash, app_data, dest_type=SidebandCore.aspect_filter)
def __init__(self, owner_app, is_service=False, is_client=False, android_app_dir=None, verbose=False, owner_service=None, service_context=None): def __init__(self, owner_app, is_service=False, is_client=False, android_app_dir=None, verbose=False, owner_service=None, service_context=None, is_daemon=False):
self.is_service = is_service self.is_service = is_service
self.is_client = is_client self.is_client = is_client
self.is_daemon = is_daemon
self.db = None self.db = None
if not self.is_service and not self.is_client: if not self.is_service and not self.is_client:
@ -769,23 +770,24 @@ class SidebandCore():
RNS.log("Error while setting LXMF propagation node: "+str(e), RNS.LOG_ERROR) RNS.log("Error while setting LXMF propagation node: "+str(e), RNS.LOG_ERROR)
def notify(self, title, content, group=None, context_id=None): def notify(self, title, content, group=None, context_id=None):
if self.config["notifications_on"]: if not self.is_daemon:
if RNS.vendor.platformutils.get_platform() == "android": if self.config["notifications_on"]:
if self.getpersistent("permissions.notifications"):
notifications_permitted = True
else:
notifications_permitted = False
else:
notifications_permitted = True
if notifications_permitted:
if RNS.vendor.platformutils.get_platform() == "android": if RNS.vendor.platformutils.get_platform() == "android":
if self.is_service: if self.getpersistent("permissions.notifications"):
self.owner_service.android_notification(title, content, group=group, context_id=context_id) notifications_permitted = True
else: else:
plyer.notification.notify(title, content, notification_icon=self.notification_icon, context_override=None) notifications_permitted = False
else: else:
plyer.notification.notify(title, content, app_icon=self.icon_32) notifications_permitted = True
if notifications_permitted:
if RNS.vendor.platformutils.get_platform() == "android":
if self.is_service:
self.owner_service.android_notification(title, content, group=group, context_id=context_id)
else:
plyer.notification.notify(title, content, notification_icon=self.notification_icon, context_override=None)
else:
plyer.notification.notify(title, content, app_icon=self.icon_32)
def log_announce(self, dest, app_data, dest_type): def log_announce(self, dest, app_data, dest_type):
try: try: