2 files changed, 18 insertions, 10 deletions
diff --git a/src/standardPush/java/de/pixart/messenger/services/InstanceIdService.java b/src/standardPush/java/de/pixart/messenger/services/InstanceIdService.java
index 465f974e6..9a3309be4 100644
--- a/src/standardPush/java/de/pixart/messenger/services/InstanceIdService.java
+++ b/src/standardPush/java/de/pixart/messenger/services/InstanceIdService.java
@@ -15,11 +15,15 @@ public class InstanceIdService extends FirebaseInstanceIdService {
     public void onTokenRefresh() {
         final Intent intent = new Intent(this, XmppConnectionService.class);
         intent.setAction(XmppConnectionService.ACTION_FCM_TOKEN_REFRESH);
-        if (Compatibility.runsAndTargetsTwentySix(this)) {
-            intent.putExtra(EventReceiver.EXTRA_NEEDS_FOREGROUND_SERVICE, true);
-            ContextCompat.startForegroundService(this, intent);
-        } else {
-            startService(intent);
+        try {
+            if (Compatibility.runsAndTargetsTwentySix(this)) {
+                intent.putExtra(EventReceiver.EXTRA_NEEDS_FOREGROUND_SERVICE, true);
+                ContextCompat.startForegroundService(this, intent);
+            } else {
+                startService(intent);
+            }
+        } catch (IllegalStateException e) {
+            Log.e(Config.LOGTAG, "InstanceIdService is not allowed to start service");
         }
     }
 }
 \ No newline at end of file
diff --git a/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java b/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java
index 88b60e348..f07167f8d 100644
--- a/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java
+++ b/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java
@@ -24,11 +24,15 @@ public class PushMessageReceiver extends FirebaseMessagingService {
         final Intent intent = new Intent(this, XmppConnectionService.class);
         intent.setAction(XmppConnectionService.ACTION_FCM_MESSAGE_RECEIVED);
         intent.putExtra("account", data.get("account"));
-        if (Compatibility.runsAndTargetsTwentySix(this)) {
-            intent.putExtra(EventReceiver.EXTRA_NEEDS_FOREGROUND_SERVICE, true);
-            ContextCompat.startForegroundService(this, intent);
-        } else {
-            startService(intent);
+        try {
+            if (Compatibility.runsAndTargetsTwentySix(this)) {
+                intent.putExtra(EventReceiver.EXTRA_NEEDS_FOREGROUND_SERVICE, true);
+                ContextCompat.startForegroundService(this, intent);
+            } else {
+                startService(intent);
+            }
+        } catch (IllegalStateException e) {
+            Log.e(Config.LOGTAG, "PushMessageReceiver is not allowed to start service");
         }
     }
 }
 \ No newline at end of file