setUpLocalIdentifiers should check for deregistered instances

Author: pete-signal

Signal/AppLaunch/AppDelegate.swift

@@ -551,7 +551,10 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
             hasInProgressRegistration = false
         }
 
-        switch finalContinuation.setUpLocalIdentifiers(willResumeInProgressRegistration: hasInProgressRegistration) {
+        switch finalContinuation.setUpLocalIdentifiers(
+            willResumeInProgressRegistration: hasInProgressRegistration,
+            canInitiateRegistration: true
+        ) {
         case .corruptRegistrationState:
             let viewController = terminalErrorViewController()
             window.rootViewController = viewController

SignalNSE/NotificationService.swift

@@ -126,7 +126,10 @@ class NotificationService: UNNotificationServiceExtension {
         // Re-warm the caches each time to pick up changes made by the main app.
         finalContinuation.runLaunchTasksIfNeededAndReloadCaches()
         // Re-set up the local identifiers to ensure they're propagated throughout the system.
-        switch finalContinuation.setUpLocalIdentifiers(willResumeInProgressRegistration: false) {
+        switch finalContinuation.setUpLocalIdentifiers(
+            willResumeInProgressRegistration: false,
+            canInitiateRegistration: false
+        ) {
         case .corruptRegistrationState:
             Logger.warn("Ignoring request to process notifications when the user isn't registered.")
             return UNNotificationContent()

SignalServiceKit/Environment/AppSetup.swift

@@ -1698,23 +1698,27 @@ extension AppSetup.FinalContinuation {
     }
 
     @MainActor
-    public func setUpLocalIdentifiers(willResumeInProgressRegistration: Bool) -> SetupError? {
+    public func setUpLocalIdentifiers(
+        willResumeInProgressRegistration: Bool,
+        canInitiateRegistration: Bool
+    ) -> SetupError? {
         let storageServiceManager = sskEnvironment.storageServiceManagerRef
         let tsAccountManager = DependenciesBridge.shared.tsAccountManager
 
         let registrationState = tsAccountManager.registrationStateWithMaybeSneakyTransaction
+        let canInitiateReregistration = registrationState.isDeregistered && canInitiateRegistration
 
         if registrationState.isRegistered {
             // TODO: Enforce already-true invariant "registered means LocalIdentifiers" via the compiler.
             let localIdentifiers = tsAccountManager.localIdentifiersWithMaybeSneakyTransaction!
             storageServiceManager.setLocalIdentifiers(localIdentifiers)
-        } else if !willResumeInProgressRegistration {
+        } else if !willResumeInProgressRegistration && !canInitiateReregistration {
             // We aren't registered, and we're not in the middle of registration, so
             // throw an error about corrupt registration.
             return .corruptRegistrationState
         }
 
-        if !willResumeInProgressRegistration {
+        if !willResumeInProgressRegistration && !canInitiateReregistration {
             // We are fully registered, and we're not in the middle of registration, so
             // ensure discoverability is configured.
             setUpDefaultDiscoverability()

SignalShareExtension/ShareViewController.swift

@@ -99,7 +99,10 @@ public class ShareViewController: UIViewController, ShareViewDelegate, SAEFailed
 
             let finalContinuation = await databaseContinuation.prepareDatabase()
             finalContinuation.runLaunchTasksIfNeededAndReloadCaches()
-            switch finalContinuation.setUpLocalIdentifiers(willResumeInProgressRegistration: false) {
+            switch finalContinuation.setUpLocalIdentifiers(
+                willResumeInProgressRegistration: false,
+                canInitiateRegistration: false
+            ) {
             case .corruptRegistrationState:
                 self.showNotRegisteredView()
                 return