Don't prompt to switch when 1 device

duckduckgo · Dec 17, 2024 · fed45fe · fed45fe
1 parent 82d1e4b
commit fed45fe
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift b/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
@@ -183,26 +183,13 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
     }
 
     @MainActor
-    func handlePairingTwoSeparateAccounts(recoveryKey: SyncCode.RecoveryKey) {
+    func promptToSwitchAccounts(recoveryKey: SyncCode.RecoveryKey) {
         let alertController = UIAlertController(
             title: UserText.syncAlertSwitchAccountTitle,
             message: UserText.syncAlertSwitchAccountMessage,
             preferredStyle: .alert)
         alertController.addAction(title: UserText.syncAlertSwitchAccountButton, style: .default) { [weak self] in
-            Task { [weak self] in
-                do {
-                    try await self?.syncService.disconnect()
-                } catch {
-                    // TODO: Send sync_user_switched_logout_error pixel
-                }
-
-                do {
-                    try await self?.loginAndShowDeviceConnected(recoveryKey: recoveryKey)
-                } catch {
-                    // TODO: Send sync_user_switched_login_error pixel
-                }
-                // TODO: Send sync_user_switched_account_pixel
-            }
+            self?.switchAccounts(recoveryKey: recoveryKey)
         }
         alertController.addAction(title: UserText.actionCancel, style: .cancel)
         // Gives time to the is syncing view to appear
@@ -213,6 +200,23 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
         }
     }
 
+    func switchAccounts(recoveryKey: SyncCode.RecoveryKey) {
+        Task { [weak self] in
+            do {
+                try await self?.syncService.disconnect()
+            } catch {
+                // TODO: Send sync_user_switched_logout_error pixel
+            }
+
+            do {
+                try await self?.loginAndShowDeviceConnected(recoveryKey: recoveryKey)
+            } catch {
+                // TODO: Send sync_user_switched_login_error pixel
+            }
+            // TODO: Send sync_user_switched_account_pixel
+        }
+    }
+
     private func getErrorType(from errorString: String?) -> AsyncErrorType? {
         guard let errorString = errorString else {
             return nil

diff --git a/DuckDuckGo/SyncSettingsViewController.swift b/DuckDuckGo/SyncSettingsViewController.swift
@@ -361,7 +361,11 @@ extension SyncSettingsViewController: ScanOrPasteCodeViewModelDelegate {
                 return true
             } catch {
                 if self.rootView.model.isSyncEnabled {
-                    handlePairingTwoSeparateAccounts(recoveryKey: recoveryKey)
+                    if rootView.model.devices.count > 1 {
+                        promptToSwitchAccounts(recoveryKey: recoveryKey)
+                    } else {
+                        switchAccounts(recoveryKey: recoveryKey)
+                    }
                 } else {
                     handleError(.unableToSyncToServer, error: error, event: .syncLoginError)
                 }