From 42da07b763d7f1b2657a1996f88785cdfb2b0d00 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 24 Feb 2023 15:51:30 -0500
Subject: [PATCH] Fix incorrect fcm status when reregistering with recovery.

---
 .../registration/viewmodel/RegistrationViewModel.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
index 9b3f4a7d18..0b26c33d86 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/viewmodel/RegistrationViewModel.java
@@ -236,7 +236,10 @@ public final class RegistrationViewModel extends BaseRegistrationViewModel {
                  .observeOn(Schedulers.io())
                  .flatMap(data -> {
                    if (data.canProceed) {
-                     return verifyReRegisterWithRecoveryPassword(pin, data.pinData);
+                     return updateFcmTokenValue().subscribeOn(Schedulers.io())
+                                                 .observeOn(Schedulers.io())
+                                                 .onErrorReturnItem("")
+                                                 .flatMap(s -> verifyReRegisterWithRecoveryPassword(pin, data.pinData));
                    } else {
                      throw new IllegalStateException("Unable to get token or master key");
                    }