From 1ecc87da76fd08a0ed2ec1a5b48a185a8da80dbe Mon Sep 17 00:00:00 2001
From: jubb <hjubb@users.noreply.github.com>
Date: Wed, 3 Mar 2021 15:43:51 +1100
Subject: [PATCH] fix: forcing the registration will cancel and restart the FCM
 task

---
 .../java/org/thoughtcrime/securesms/ApplicationContext.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 4e141431f8..14ab8be120 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -447,7 +447,10 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     }
 
     public void registerForFCMIfNeeded(final Boolean force) {
-        if (firebaseInstanceIdJob != null && firebaseInstanceIdJob.isActive()) return;
+        if (firebaseInstanceIdJob != null && firebaseInstanceIdJob.isActive() && !force) return;
+        if (force && firebaseInstanceIdJob != null) {
+            firebaseInstanceIdJob.cancel(null);
+        }
         firebaseInstanceIdJob = FcmUtils.getFcmInstanceId(task->{
             if (!task.isSuccessful()) {
                 Log.w("Loki", "FirebaseInstanceId.getInstance().getInstanceId() failed." + task.getException());