From ced56db57baa231769729300858073106f7eed67 Mon Sep 17 00:00:00 2001
From: Max Radermacher <max@signal.org>
Date: Wed, 3 May 2023 15:44:41 -0700
Subject: [PATCH] Call markAsOnboarded if we're already registered

---
 Signal/src/AppDelegate.swift                                   | 3 ++-
 .../Onboarding/Deprecated_OnboardingController.swift           | 2 +-
 Signal/src/environment/SignalApp.swift                         | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Signal/src/AppDelegate.swift b/Signal/src/AppDelegate.swift
index bf71e1f7ae..aaff0f0b25 100644
--- a/Signal/src/AppDelegate.swift
+++ b/Signal/src/AppDelegate.swift
@@ -269,7 +269,8 @@ extension AppDelegate {
         switch launchInterface {
         case .registration, .deprecatedOnboarding:
             hasInProgressRegistration = true
-        case .chatList:
+        case .chatList(let onboardingController):
+            onboardingController.markAsOnboarded()
             hasInProgressRegistration = false
         }
 
diff --git a/Signal/src/ViewControllers/Registration/Onboarding/Deprecated_OnboardingController.swift b/Signal/src/ViewControllers/Registration/Onboarding/Deprecated_OnboardingController.swift
index 4e24139131..5b03a1c68e 100644
--- a/Signal/src/ViewControllers/Registration/Onboarding/Deprecated_OnboardingController.swift
+++ b/Signal/src/ViewControllers/Registration/Onboarding/Deprecated_OnboardingController.swift
@@ -161,7 +161,7 @@ public class Deprecated_OnboardingController: NSObject {
     @objc
     public func markAsOnboarded() {
         guard !tsAccountManager.isOnboarded else { return }
-        self.databaseStorage.asyncWrite {
+        self.databaseStorage.write {
             Logger.info("completed onboarding")
             self.tsAccountManager.setIsOnboarded(true, transaction: $0)
         }
diff --git a/Signal/src/environment/SignalApp.swift b/Signal/src/environment/SignalApp.swift
index 815f5c17ce..1abffdec7c 100644
--- a/Signal/src/environment/SignalApp.swift
+++ b/Signal/src/environment/SignalApp.swift
@@ -66,8 +66,7 @@ extension SignalApp {
         case .deprecatedOnboarding(let onboardingController):
             showDeprecatedOnboardingView(onboardingController)
             AppReadiness.setUIIsReady()
-        case .chatList(let onboardingController):
-            onboardingController.markAsOnboarded()
+        case .chatList:
             showConversationSplitView()
         }