From e65068d2267246962b9764d86eb3a906e3dde68f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 8 Oct 2015 00:52:04 +0200 Subject: [PATCH] catch exception when unregistering receivers that have not been registered before --- .../services/XmppConnectionService.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 18094cfbe..ddc40d34e 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -662,7 +662,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa @Override public void onDestroy() { - unregisterReceiver(this.mEventReceiver); + try { + unregisterReceiver(this.mEventReceiver); + } catch (IllegalArgumentException e) { + //ignored + } super.onDestroy(); } @@ -672,12 +676,16 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa filter.addAction(Intent.ACTION_SCREEN_OFF); registerReceiver(this.mEventReceiver, filter); } else { - unregisterReceiver(this.mEventReceiver); + try { + unregisterReceiver(this.mEventReceiver); + } catch (IllegalArgumentException e) { + //ignored + } } } public void toggleForegroundService() { - if (getPreferences().getBoolean("keep_foreground_service",false)) { + if (getPreferences().getBoolean("keep_foreground_service", false)) { startForeground(NotificationService.FOREGROUND_NOTIFICATION_ID, this.mNotificationService.createForegroundNotification()); } else { stopForeground(true);