refactor: rename some parameters and change the structure of onBiometricCancelled function

Author: joragua

owncloudApp/src/main/java/com/owncloud/android/presentation/security/biometric/BiometricActivity.kt

@@ -67,7 +67,7 @@ class BiometricActivity : AppCompatActivity() {
         if (biometricManager.canAuthenticate(BIOMETRIC_WEAK) == BiometricManager.BIOMETRIC_SUCCESS) {
             showBiometricPrompt()
         } else {
-            authError()
+            authError(biometricHasFailed = true)
         }
     }
 
@@ -83,13 +83,13 @@ class BiometricActivity : AppCompatActivity() {
                 override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
                     super.onAuthenticationError(errorCode, errString)
                     Timber.e("onAuthenticationError ($errorCode): $errString")
-                    authError(errorCode == 13) // ErrorCode 13: Canceled
+                    authError(biometricHasFailed = errorCode != BiometricPrompt.ERROR_NEGATIVE_BUTTON)
                 }
 
                 override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
                     super.onAuthenticationSucceeded(result)
                     if (result.cryptoObject?.cipher != cryptoObject.cipher) {
-                        authError()
+                        authError(biometricHasFailed = true)
                     } else {
                         if (biometricViewModel.shouldAskForNewPassCode()) {
                             biometricViewModel.removePassCode()
@@ -115,15 +115,15 @@ class BiometricActivity : AppCompatActivity() {
             biometricPrompt.authenticate(promptInfo, cryptoObject)
         } catch (e: Exception) {
             Timber.e(e, "cryptoObject property has not been initialized correctly")
-            authError()
+            authError(biometricHasFailed = true)
         }
     }
 
-    private fun authError(biometricCanceledManually: Boolean = false) {
+    private fun authError(biometricHasFailed: Boolean) {
         if (PassCodeManager.isPassCodeEnabled()) {
-            PassCodeManager.onBiometricCancelled(this, biometricCanceledManually)
+            PassCodeManager.onBiometricCancelled(this, biometricHasFailed)
         } else if (PatternManager.isPatternEnabled()) {
-            PatternManager.onBiometricCancelled(this, biometricCanceledManually)
+            PatternManager.onBiometricCancelled(this, biometricHasFailed)
         }
 
         finish()

owncloudApp/src/main/java/com/owncloud/android/presentation/security/biometric/BiometricManager.kt

@@ -60,11 +60,11 @@ object BiometricManager {
                 activity.startActivity(i)
             } else if (isPassCodeEnabled()) {
                 // Cancel biometric lock and use passcode unlock method
-                PassCodeManager.onBiometricCancelled(activity)
+                PassCodeManager.onBiometricCancelled(activity = activity, biometricHasFailed = true)
                 visibleActivities.add(activity.javaClass)
             } else if (isPatternEnabled()) {
                 // Cancel biometric lock and use pattern unlock method
-                PatternManager.onBiometricCancelled(activity)
+                PatternManager.onBiometricCancelled(activity = activity, biometricHasFailed = true)
                 visibleActivities.add(activity.javaClass)
             }
 

owncloudApp/src/main/java/com/owncloud/android/presentation/security/passcode/PassCodeManager.kt

@@ -54,7 +54,7 @@ object PassCodeManager {
                 return
             }
 
-            askUserForPasscode(activity)
+            askUserForPasscode(activity = activity, biometricHasFailed = false)
         } else if (preferencesProvider.getBoolean(PassCodeActivity.PREFERENCE_MIGRATION_REQUIRED, false)) {
             val intent = Intent(appContext, PassCodeActivity::class.java).apply {
                 action = PassCodeActivity.ACTION_CREATE
@@ -88,7 +88,7 @@ object PassCodeManager {
     fun isPassCodeEnabled(): Boolean =
         preferencesProvider.getBoolean(PassCodeActivity.PREFERENCE_SET_PASSCODE, false)
 
-    private fun askUserForPasscode(activity: Activity, biometricHasFailed: Boolean = false) {
+    private fun askUserForPasscode(activity: Activity, biometricHasFailed: Boolean) {
         val i = Intent(appContext, PassCodeActivity::class.java).apply {
             action = PassCodeActivity.ACTION_CHECK
             flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT or Intent.FLAG_ACTIVITY_SINGLE_TOP
@@ -97,12 +97,7 @@ object PassCodeManager {
         activity.startActivity(i)
     }
 
-    fun onBiometricCancelled(activity: Activity, biometricCanceledManually: Boolean = false) {
-        if (biometricCanceledManually) {
-            askUserForPasscode(activity)
-        } else {
-            // Biometric unlock has failed
-            askUserForPasscode(activity, true)
-        }
+    fun onBiometricCancelled(activity: Activity, biometricHasFailed: Boolean) {
+        askUserForPasscode(activity, biometricHasFailed)
     }
 }

owncloudApp/src/main/java/com/owncloud/android/presentation/security/pattern/PatternManager.kt

@@ -53,7 +53,7 @@ object PatternManager {
                 return
             }
 
-            askUserForPattern(activity)
+            askUserForPattern(activity = activity, biometricHasFailed = false)
         }
 
         visibleActivities.add(activity.javaClass)
@@ -80,7 +80,7 @@ object PatternManager {
     fun isPatternEnabled(): Boolean =
         preferencesProvider.getBoolean(PatternActivity.PREFERENCE_SET_PATTERN, false)
 
-    private fun askUserForPattern(activity: Activity, biometricHasFailed: Boolean = false) {
+    private fun askUserForPattern(activity: Activity, biometricHasFailed: Boolean) {
         val i = Intent(appContext, PatternActivity::class.java).apply {
             action = PatternActivity.ACTION_CHECK
             flags = Intent.FLAG_ACTIVITY_REORDER_TO_FRONT or Intent.FLAG_ACTIVITY_SINGLE_TOP
@@ -89,12 +89,7 @@ object PatternManager {
         activity.startActivity(i)
     }
 
-    fun onBiometricCancelled(activity: Activity, biometricCanceledManually: Boolean = false) {
-        if (biometricCanceledManually) {
-            askUserForPattern(activity)
-        } else {
-            // Biometric unlock has failed
-            askUserForPattern(activity, true)
-        }
+    fun onBiometricCancelled(activity: Activity, biometricHasFailed: Boolean) {
+        askUserForPattern(activity, biometricHasFailed)
     }
 }