From 286c340f019b7a77afd297c2930017632a095174 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 9 Aug 2022 14:27:51 -0400 Subject: [PATCH] Do not start service is non-urgent push. --- .../org/thoughtcrime/securesms/gcm/FcmReceiveService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java index d401cad034..c23bd4be9a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java @@ -78,7 +78,7 @@ public class FcmReceiveService extends FirebaseMessagingService { } private static void handleReceivedNotification(Context context, @Nullable RemoteMessage remoteMessage) { - boolean enqueueSuccessful; + boolean enqueueSuccessful = false; try { long timeSinceLastRefresh = System.currentTimeMillis() - SignalStore.misc().getLastFcmForegroundServiceTime(); @@ -87,7 +87,7 @@ public class FcmReceiveService extends FirebaseMessagingService { if (FeatureFlags.useFcmForegroundService() && Build.VERSION.SDK_INT >= 31 && remoteMessage != null && remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH && timeSinceLastRefresh > FCM_FOREGROUND_INTERVAL) { enqueueSuccessful = FcmFetchManager.enqueue(context, true); SignalStore.misc().setLastFcmForegroundServiceTime(System.currentTimeMillis()); - } else { + } else if (Build.VERSION.SDK_INT < 26 || remoteMessage == null || remoteMessage.getPriority() == RemoteMessage.PRIORITY_HIGH) { enqueueSuccessful = FcmFetchManager.enqueue(context, false); } } catch (Exception e) { @@ -96,7 +96,7 @@ public class FcmReceiveService extends FirebaseMessagingService { } if (!enqueueSuccessful) { - Log.w(TAG, "Failed to start service. Falling back to legacy approach."); + Log.w(TAG, "Unable to start service. Falling back to legacy approach."); FcmFetchManager.retrieveMessages(context); } }