Fix #6647: Send to device extension needs to wait for FxA to initiali…

…ze (#6666) * Fix #6647: Send to device extension needs to wait for FxA to initialize * disable user interaction
mozilla-mobile · May 21, 2020 · 5ad5f17 · 5ad5f17
1 parent 58d792a
commit 5ad5f17
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Extensions/ShareTo/ShareViewController.swift b/Extensions/ShareTo/ShareViewController.swift
@@ -367,12 +367,16 @@ extension ShareViewController {
         }
 
         gesture.isEnabled = false
-        sendToDevice = SendToDevice()
-        guard let sendToDevice = sendToDevice else { return }
-        sendToDevice.sharedItem = item
-        sendToDevice.delegate = delegate
-        let vc = sendToDevice.initialViewController()
-        navigationController?.pushViewController(vc, animated: true)
+        view.isUserInteractionEnabled = false
+        RustFirefoxAccounts.shared.accountManager.uponQueue(.main) { _ in
+            self.view.isUserInteractionEnabled = true
+            self.sendToDevice = SendToDevice()
+            guard let sendToDevice = self.sendToDevice else { return }
+            sendToDevice.sharedItem = item
+            sendToDevice.delegate = self.delegate
+            let vc = sendToDevice.initialViewController()
+            self.navigationController?.pushViewController(vc, animated: true)
+        }
     }
 
     func openFirefox(withUrl url: String, isSearch: Bool) {