1 files changed, 2 insertions, 20 deletions

diff --git a/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java b/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java
index 594225f3b..17f4ef32a 100644
--- a/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java
+++ b/src/standardPush/java/de/pixart/messenger/services/PushMessageReceiver.java
@@ -24,16 +24,7 @@ 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"));
-        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 after receiving message");
-        }
+        Compatibility.startService(this, intent);
     }
 
     @Override
@@ -44,15 +35,6 @@ public class PushMessageReceiver extends FirebaseMessagingService {
         }
         final Intent intent = new Intent(this, XmppConnectionService.class);
         intent.setAction(XmppConnectionService.ACTION_FCM_TOKEN_REFRESH);
-        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 after receiving new token");
-        }
+        Compatibility.startService(this, intent);
     }
 }
\ No newline at end of file