fix: forcing the registration will cancel and restart the FCM task

4 years ago · 1ecc87da76
parent 1b417362ae
commit 1ecc87da76
1 changed files with 4 additions and 1 deletions
--- 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());