Fix logic

duckduckgo · Apr 15, 2024 · f023a1f · f023a1f
1 parent e0386be
commit f023a1f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift b/LocalPackages/SyncUI/Sources/SyncUI/ViewModels/SyncSettingsViewModel.swift
@@ -155,7 +155,11 @@ public class SyncSettingsViewModel: ObservableObject {
     }
 
     func saveRecoveryPDF() {
-        delegate?.shareRecoveryPDF()
+        Task { @MainActor in
+            if await commonAuthenticate() {
+                delegate?.shareRecoveryPDF()
+            }
+        }
     }
 
     func scanQRCode() {
@@ -214,6 +218,10 @@ public class SyncSettingsViewModel: ObservableObject {
     }
 
     public func recoverSyncDataPressed() {
-        delegate?.showRecoverData()
+        Task { @MainActor in
+            if await commonAuthenticate() {
+                delegate?.showRecoverData()
+            }
+        }
     }
 }
diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsView.swift
@@ -88,6 +88,18 @@ public struct SyncSettingsView: View {
             .navigationTitle(UserText.syncTitle)
             .applyListStyle()
             .environmentObject(model)
+            .alert(isPresented: $model.shouldShowPasscodeRequiredAlert) {
+                Alert(
+                    title: Text("Secure Your Device to Use Sync & Backup"),
+                    message: Text("A device password is required to use Sync & Backup."),
+                    dismissButton: .default(Text("Go to Settings"), action: {
+                        UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!,
+                                                  options: [:],
+                                                  completionHandler: nil)
+                        model.shouldShowPasscodeRequiredAlert = false
+                    })
+                )
+            }
         }
 
     }

diff --git a/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsViewExtension.swift b/LocalPackages/SyncUI/Sources/SyncUI/Views/SyncSettingsViewExtension.swift
@@ -74,11 +74,6 @@ extension SyncSettingsView {
 
     @ViewBuilder
     func otherOptions() -> some View {
-        let alertBinding = Binding<Bool>(
-            get: { model.shouldShowPasscodeRequiredAlert },
-            set: { value in model.shouldShowPasscodeRequiredAlert = value }
-        )
-
         Section {
             Button(UserText.syncAndBackUpThisDeviceLink) {
                 Task { @MainActor in
@@ -107,18 +102,6 @@ extension SyncSettingsView {
                 })
             })
             .disabled(!model.isAccountRecoveryAvailable)
-            .alert(isPresented: alertBinding) {
-                Alert(
-                    title: Text("Secure Your Device to Use Sync & Backup"),
-                    message: Text("A device password is required to use Sync & Backup."),
-                    dismissButton: .default(Text("Go to Settings"), action: {
-                        UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!,
-                                                  options: [:],
-                                                  completionHandler: nil)
-                        model.shouldShowPasscodeRequiredAlert = false
-                    })
-                )
-            }
 
         } header: {
             Text(UserText.otherOptionsSectionHeader)