From 04b0c010159926cb65d584f32c0b129725816f8f Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 7 Oct 2022 09:52:23 -0400
Subject: [PATCH] Catch a foreground service start exception.

---
 .../java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
index 3d58e4fbd..fa039b60c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmFetchManager.kt
@@ -83,7 +83,12 @@ object FcmFetchManager {
         context.stopService(Intent(context, FcmFetchBackgroundService::class.java))
 
         if (startedForeground) {
-          context.startService(FcmFetchForegroundService.buildStopIntent(context))
+          try {
+            context.startService(FcmFetchForegroundService.buildStopIntent(context))
+          } catch (e: IllegalStateException) {
+            Log.w(TAG, "Failed to stop the foreground notification!", e)
+          }
+
           startedForeground = false
         }
       }