From 4a402126b4a8dd067a8865b6708839f32b6b73be Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Thu, 29 Jul 2021 01:19:26 -0700
Subject: [PATCH] Make sure to restore registration before relink

---
 ts/background.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ts/background.ts b/ts/background.ts
index 8b9bec1c4..fb2cc0045 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -3540,7 +3540,6 @@ export async function startApp(): Promise<void> {
 
       // These two bits of data are important to ensure that the app loads up
       //   the conversation list, instead of showing just the QR code screen.
-      window.Signal.Util.Registration.markEverDone();
       if (previousNumberId !== undefined) {
         await window.textsecure.storage.put(NUMBER_ID_KEY, previousNumberId);
       }
@@ -3570,6 +3569,8 @@ export async function startApp(): Promise<void> {
         'Something went wrong clearing local configuration',
         eraseError && eraseError.stack ? eraseError.stack : eraseError
       );
+    } finally {
+      window.Signal.Util.Registration.markEverDone();
     }
   }