handle better a negative scenario

duckduckgo · Nov 28, 2023 · a5b1a1e · a5b1a1e
1 parent 09738ac
commit a5b1a1e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/DuckDuckGo/SyncSettingsViewController+PDFRendering.swift b/DuckDuckGo/SyncSettingsViewController+PDFRendering.swift
@@ -41,10 +41,7 @@ extension SyncSettingsViewController {
 
         navigationController?.visibleViewController?.presentShareSheet(withItems: [code],
                                                                        fromView: view,
-                                                                       overrideInterfaceStyle: .dark) { [weak self] _, success, _, _ in
-            guard success else { return }
-            self?.navigationController?.visibleViewController?.dismiss(animated: true)
-        }
+                                                                       overrideInterfaceStyle: .dark) { _, _, _, _ in }
     }
 
 }

diff --git a/DuckDuckGo/SyncSettingsViewController.swift b/DuckDuckGo/SyncSettingsViewController.swift
@@ -134,6 +134,7 @@ class SyncSettingsViewController: UIHostingController<SyncSettingsView> {
         if let presentedViewController = navigationController?.presentedViewController {
             if !(presentedViewController is UIHostingController<SyncSettingsView>) {
                 presentedViewController.dismiss(animated: true, completion: nil)
+                endConnectMode()
             }
         }
     }
@@ -212,6 +213,7 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
     }
 
     func syncCodeEntered(code: String) async -> Bool {
+        var shouldShowSyncEnabled = true
         do {
             guard let syncCode = try? SyncCode.decodeBase64String(code) else {
                 return false
@@ -226,19 +228,21 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
                 showPreparingSync()
                 if syncService.account == nil {
                     try await syncService.createAccount(deviceName: deviceName, deviceType: deviceType)
+                    self.dismissVCAndShowRecoveryPDF()
+                    shouldShowSyncEnabled = false
                     rootView.model.syncEnabled(recoveryCode: recoveryCode)
                 }
                 try await syncService.transmitRecoveryKey(connectKey)
-                self.rootView.model.isSyncingDevices = true
 
                 self.rootView.model.$devices
                     .removeDuplicates()
                     .dropFirst()
                     .prefix(1)
                     .sink { [weak self] _ in
                         guard let self else { return }
-                        self.dismissVCAndShowRecoveryPDF()
-                        self.rootView.model.isSyncingDevices = false
+                        if shouldShowSyncEnabled {
+                            self.dismissVCAndShowRecoveryPDF()
+                        }
                     }.store(in: &cancellables)
 
                 return true