Cleaning up view type and handling cancel case for general

brave · Aug 28, 2023 · 21610ec · 21610ec
1 parent 68dbdac
commit 21610ec
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/Sources/Brave/Frontend/Passcode/WindowProtection.swift b/Sources/Brave/Frontend/Passcode/WindowProtection.swift
@@ -89,6 +89,7 @@ public class WindowProtection {
   private var protectedWindow: UIWindow
   private var passcodeWindow: UIWindow
   private var context = LAContext()
+  private var viewType: AuthViewType = .general
 
   private var isVisible: Bool = false {
     didSet {
@@ -174,7 +175,7 @@ public class WindowProtection {
   }
 
   @objc private func tappedUnlock() {
-    presentLocalAuthentication()
+    presentLocalAuthentication(viewType: viewType)
   }
 
   @objc private func tappedCancel() {
@@ -208,7 +209,7 @@ public class WindowProtection {
     }
   }
 
-  private func presentLocalAuthentication(viewType: AuthViewType = .general, completion: ((Bool, LAError.Code?) -> Void)? = nil) {
+  private func presentLocalAuthentication(viewType: AuthViewType, completion: ((Bool, LAError.Code?) -> Void)? = nil) {
     if !context.canEvaluatePolicy(.deviceOwnerAuthentication, error: nil) {
       completion?(false, .passcodeNotSet)
       return
@@ -229,7 +230,7 @@ public class WindowProtection {
               completion?(true, nil)
             })
         } else {
-          lockedViewController.unlockButton.isHidden = false
+          lockedViewController.unlockButton.isHidden = viewType == .general
 
           let errorPolicy = error as? LAError
           completion?(false, errorPolicy?.code)
@@ -248,6 +249,8 @@ public class WindowProtection {
     if isVisible {
       return
     }
+
+    self.viewType = viewType
 
     context = LAContext()
     updateVisibleStatusForForeground(determineLockWithPasscode, viewType: viewType) { status, error in

diff --git a/Sources/Brave/Frontend/Sync/SyncSettingsTableViewController.swift b/Sources/Brave/Frontend/Sync/SyncSettingsTableViewController.swift
@@ -274,7 +274,7 @@ class SyncSettingsTableViewController: SyncViewController, UITableViewDelegate,
       if toggleExistingStatus {
         performSyncDataTypeStatusChange(type: syncDataType)
       } else {
-        askForAuthentication() { status, error in
+        askForAuthentication(viewType: .sync) { status, error in
           guard status else {
             toggle.setOn(toggleExistingStatus, animated: false)
             return
@@ -336,7 +336,7 @@ class SyncSettingsTableViewController: SyncViewController, UITableViewDelegate,
 
   @objc
   private func onSyncInternalsTapped() {
-    askForAuthentication() { [weak self] status, error in
+    askForAuthentication(viewType: .sync) { [weak self] status, error in
       guard let self = self, status else { return }
 
       let syncInternalsController = self.syncAPI.createSyncInternalsController().then {
@@ -592,7 +592,7 @@ extension SyncSettingsTableViewController {
   }
 
   private func addAnotherDevice() {
-    askForAuthentication() { [weak self] status, error in
+    askForAuthentication(viewType: .sync) { [weak self] status, error in
       guard let self = self, status else { return }
 
       let view = SyncSelectDeviceTypeViewController()

diff --git a/Sources/Brave/Frontend/Sync/SyncViewController.swift b/Sources/Brave/Frontend/Sync/SyncViewController.swift
@@ -54,7 +54,7 @@ class SyncViewController: AuthenticationController {
     super.viewWillAppear(animated)
 
     if requiresAuthentication {
-      askForAuthentication() { [weak self] success, error in
+      askForAuthentication(viewType: .sync) { [weak self] success, error in
         guard let self else { return }
 
         if !success, error != .userCancel {

diff --git a/Sources/Brave/Frontend/Sync/SyncWelcomeViewController.swift b/Sources/Brave/Frontend/Sync/SyncWelcomeViewController.swift
@@ -256,7 +256,7 @@ class SyncWelcomeViewController: SyncViewController {
 
   @objc
   private func onSyncInternalsAction() {
-    askForAuthentication() { [weak self] status, error in
+    askForAuthentication(viewType: .sync) { [weak self] status, error in
       guard let self = self, status else { return }
 
       let syncInternalsController = syncAPI.createSyncInternalsController().then {

diff --git a/Sources/Brave/Frontend/Widgets/LoadingViewController.swift b/Sources/Brave/Frontend/Widgets/LoadingViewController.swift
@@ -59,7 +59,7 @@ public class AuthenticationController: LoadingViewController {
 
   /// A method to ask biometric authentication to user
   /// - Parameter completion: block returning authentication status
-  func askForAuthentication(viewType: AuthViewType = .sync, completion: ((Bool, LAError.Code?) -> Void)? = nil) {
+  func askForAuthentication(viewType: AuthViewType, completion: ((Bool, LAError.Code?) -> Void)? = nil) {
     guard let windowProtection = windowProtection else {
       completion?(false, nil)
       return