Avoid double presenting during provisioning flow

Author: harry-signal

Signal/Provisioning/UserInterface/ProvisioningController.swift

@@ -325,6 +325,12 @@ class ProvisioningController: NSObject {
     }
 
     func provisioningDidComplete(from viewController: UIViewController) {
+        if viewController.presentedViewController != nil {
+            viewController.dismiss(animated: true) {
+                self.provisioningDidComplete(from: viewController)
+            }
+            return
+        }
         SignalApp.shared.showConversationSplitView(appReadiness: appReadiness)
     }
 
@@ -345,6 +351,12 @@ class ProvisioningController: NSObject {
                 })
                 return
             }
+            if viewController.presentedViewController != nil {
+                viewController.dismiss(animated: true, completion: {
+                    popAndThenAwaitProvisioning()
+                })
+                return
+            }
             navigationController.popToViewController(viewController, animated: true)
             Task {
                 await awaitProvisioning(
@@ -431,7 +443,9 @@ class ProvisioningController: NSObject {
                         navigationController: navigationController,
                         progressViewModel: progressViewModel
                     )
-                    progressViewController.presentActionSheet(errorActionSheet)
+                    if progressViewController.presentedViewController == nil {
+                        progressViewController.presentActionSheet(errorActionSheet)
+                    }
                 }
             }
         } else {