manage synced enabled errors

duckduckgo · Dec 13, 2023 · e08fe9f · e08fe9f
1 parent 8a18fe7
commit e08fe9f
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift b/DuckDuckGo/SyncSettingsViewController+SyncDelegate.swift
@@ -76,8 +76,14 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
         let okAction = UIAlertAction(title: UserText.syncPausedAlertOkButton, style: .default, handler: nil)
         alertController.addAction(okAction)
 
-        // Give time to the is syncing view to appear
-        DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+        if type == .unableToSync {
+            // Give time to the is syncing view to appear
+            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                self.dismissPresentedViewController { [weak self] in
+                    self?.present(alertController, animated: true, completion: nil)
+                }
+            }
+        } else {
             self.dismissPresentedViewController { [weak self] in
                 self?.present(alertController, animated: true, completion: nil)
             }
@@ -170,14 +176,15 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
             alert.addAction(title: UserText.syncTurnOffConfirmAction, style: .destructive) {
                 Task { @MainActor in
                     do {
-                        self.rootView.model.isSyncEnabled = false
                         try await self.syncService.disconnect()
+                        self.rootView.model.isSyncEnabled = false
                         AppUserDefaults().isSyncBookmarksPaused = false
                         AppUserDefaults().isSyncCredentialsPaused = false
+                        continuation.resume(returning: true)
                     } catch {
                         self.handleError(SyncError.unableToTurnSyncOff, error: error)
+                        continuation.resume(returning: false)
                     }
-                    continuation.resume(returning: true)
                 }
             }
             self.present(alert, animated: true)
@@ -195,14 +202,15 @@ extension SyncSettingsViewController: SyncManagementViewModelDelegate {
             alert.addAction(title: UserText.syncDeleteAllConfirmAction, style: .destructive) {
                 Task { @MainActor in
                     do {
-                        self.rootView.model.isSyncEnabled = false
                         try await self.syncService.deleteAccount()
+                        self.rootView.model.isSyncEnabled = false
                         AppUserDefaults().isSyncBookmarksPaused = false
                         AppUserDefaults().isSyncCredentialsPaused = false
+                        continuation.resume(returning: true)
                     } catch {
                         self.handleError(SyncError.unableToDeleteData, error: error)
+                        continuation.resume(returning: false)
                     }
-                    continuation.resume(returning: true)
                 }
             }
             self.present(alert, animated: true)

diff --git a/DuckDuckGo/SyncSettingsViewController.swift b/DuckDuckGo/SyncSettingsViewController.swift
@@ -173,7 +173,10 @@ class SyncSettingsViewController: UIHostingController<SyncSettingsView> {
 
     func dismissPresentedViewController(completion: (() -> Void)? = nil) {
         guard let presentedViewController = navigationController?.presentedViewController,
-              !(presentedViewController is UIHostingController<SyncSettingsView>) else { return }
+              !(presentedViewController is UIHostingController<SyncSettingsView>) else { 
+            completion?()
+            return
+        }
         presentedViewController.dismiss(animated: true, completion: completion)
         endConnectMode()
     }
@@ -190,7 +193,8 @@ class SyncSettingsViewController: UIHostingController<SyncSettingsView> {
                 let devices = try await syncService.fetchDevices()
                 mapDevices(devices)
             } catch {
-                handleError(SyncError.unableToGetDevices, error: error)
+                // Not displaying error since there is the spinner and it is called every few seconds
+//                assertionFailure(error.localizedDescription)
             }
         }
     }