[fix/biometrical-unlock-setup] Fix: Setup Passcode with Biometrical U…

…nlock (#1112) * #5086 fix for passcode setup with biometrical unlock enabled: - biometrical unlock button no longer appear in setup view - after passcode was successfully setup, show biometrical unlock for permissions dialog * removed unneeded comment
owncloud · Mar 24, 2022 · fde7e56 · fde7e56
1 parent 4e1b13b
commit fde7e56
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/ownCloudAppShared/AppLock/AppLockManager.swift b/ownCloudAppShared/AppLock/AppLockManager.swift
@@ -148,14 +148,16 @@ public class AppLockManager: NSObject {
 	}
 
 	// MARK: - Show / Dismiss Passcode View
-	public func showLockscreenIfNeeded(forceShow: Bool = false, context: LAContext = LAContext()) {
-		if self.shouldDisplayLockscreen || forceShow {
+	public func showLockscreenIfNeeded(forceShow: Bool = false, setupMode: Bool = false, context: LAContext = LAContext()) {
+		if self.shouldDisplayLockscreen || forceShow || setupMode {
 			lockscreenOpenForced = forceShow
 			lockscreenOpen = true
 
 			// Show biometrical
 			if !forceShow, !self.shouldDisplayCountdown, self.biometricalAuthenticationSucceeded {
 				showBiometricalAuthenticationInterface(context: context)
+			} else if setupMode {
+				showBiometricalAuthenticationInterface(context: context)
 			}
 		}
 	}

diff --git a/ownCloudAppShared/AppLock/PasscodeSetupCoordinator.swift b/ownCloudAppShared/AppLock/PasscodeSetupCoordinator.swift
@@ -159,7 +159,7 @@ public class PasscodeSetupCoordinator {
 					self.completionHandler?(false)
 				})
 				if AppLockManager.supportedOnDevice {
-					AppLockManager.shared.showLockscreenIfNeeded()
+					AppLockManager.shared.showLockscreenIfNeeded(setupMode: true)
 				}
 			} else {
 				let alertController = UIAlertController(title: biometricalSecurityName, message: String(format:"Unlock using %@?".localized, biometricalSecurityName), preferredStyle: .alert)
@@ -170,7 +170,7 @@ public class PasscodeSetupCoordinator {
 						self.completionHandler?(false)
 					})
 					if AppLockManager.supportedOnDevice {
-						AppLockManager.shared.showLockscreenIfNeeded()
+						AppLockManager.shared.showLockscreenIfNeeded(setupMode: true)
 					}
 				}))
 

diff --git a/ownCloudAppShared/AppLock/PasscodeViewController.swift b/ownCloudAppShared/AppLock/PasscodeViewController.swift
@@ -173,7 +173,7 @@ public class PasscodeViewController: UIViewController, Themeable {
 		self.screenBlurringEnabled = { self.screenBlurringEnabled }()
 		self.errorMessageLabel?.minimumScaleFactor = 0.5
 		self.errorMessageLabel?.adjustsFontSizeToFitWidth = true
-		self.biometricalButtonHidden = !(!AppLockSettings.shared.biometricalSecurityEnabled || self.cancelButtonHidden)
+		self.biometricalButtonHidden = !((!AppLockSettings.shared.biometricalSecurityEnabled || !AppLockSettings.shared.lockEnabled) || self.cancelButtonHidden)
 		updateKeypadButtons()
         if let biometricalSecurityName = LAContext().supportedBiometricsAuthenticationName() {
             self.biometricalButton?.accessibilityLabel = biometricalSecurityName