fix: avoid crash when biometrics fail due to a system error

Author: joragua

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

@@ -3,8 +3,9 @@
  *
  * @author David González Verdugo
  * @author Juan Carlos Garrote Gascón
+ * @author Jorge Aguado Recio
  *
- * Copyright (C) 2023 ownCloud GmbH.
+ * Copyright (C) 2025 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -82,7 +83,7 @@ class BiometricActivity : AppCompatActivity() {
                 override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
                     super.onAuthenticationError(errorCode, errString)
                     Timber.e("onAuthenticationError ($errorCode): $errString")
-                    authError()
+                    authError(errorCode == 13) // ErrorCode 13: Canceled
                 }
 
                 override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
@@ -110,14 +111,19 @@ class BiometricActivity : AppCompatActivity() {
             })
 
         // Displays the "log in" prompt.
-        biometricPrompt.authenticate(promptInfo, cryptoObject)
+        try {
+            biometricPrompt.authenticate(promptInfo, cryptoObject)
+        } catch (e: Exception) {
+            Timber.e(e, "cryptoObject property has not been initialized correctly")
+            authError()
+        }
     }
 
-    private fun authError() {
+    private fun authError(biometricCanceledManually: Boolean = false) {
         if (PassCodeManager.isPassCodeEnabled()) {
-            PassCodeManager.onBiometricCancelled(this)
+            PassCodeManager.onBiometricCancelled(this, biometricCanceledManually)
         } else if (PatternManager.isPatternEnabled()) {
-            PatternManager.onBiometricCancelled(this)
+            PatternManager.onBiometricCancelled(this, biometricCanceledManually)
         }
 
         finish()

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

@@ -2,8 +2,9 @@
  * ownCloud Android client application
  *
  * @author Juan Carlos Garrote Gascón
+ * @author Jorge Aguado Recio
  *
- * Copyright (C) 2023 ownCloud GmbH.
+ * Copyright (C) 2025 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -40,6 +41,8 @@ object PassCodeManager {
     private val visibleActivities: MutableSet<Class<*>> = mutableSetOf()
     private val preferencesProvider = OCSharedPreferencesProvider(appContext)
 
+    private const val BIOMETRIC_HAS_FAILED = "BIOMETRIC_HAS_FAILED"
+
     fun onActivityStarted(activity: Activity) {
         if (!exemptOfPasscodeActivities.contains(activity.javaClass) && passCodeShouldBeRequested()) {
 
@@ -86,15 +89,21 @@ object PassCodeManager {
     fun isPassCodeEnabled(): Boolean =
         preferencesProvider.getBoolean(PassCodeActivity.PREFERENCE_SET_PASSCODE, false)
 
-    private fun askUserForPasscode(activity: Activity) {
+    private fun askUserForPasscode(activity: Activity, biometricHasFailed: Boolean = false) {
         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
+            putExtra(BIOMETRIC_HAS_FAILED, biometricHasFailed)
         }
         activity.startActivity(i)
     }
 
-    fun onBiometricCancelled(activity: Activity) {
-        askUserForPasscode(activity)
+    fun onBiometricCancelled(activity: Activity, biometricCanceledManually: Boolean = false) {
+        if (biometricCanceledManually) {
+            askUserForPasscode(activity)
+        } else {
+            // Biometric unlock has failed
+            askUserForPasscode(activity, true)
+        }
     }
 }

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

@@ -2,8 +2,9 @@
  * ownCloud Android client application
  *
  * @author Juan Carlos Garrote Gascón
+ * @author Jorge Aguado Recio
  *
- * Copyright (C) 2023 ownCloud GmbH.
+ * Copyright (C) 2025 ownCloud GmbH.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2,
@@ -40,6 +41,8 @@ object PatternManager {
     private val visibleActivities: MutableSet<Class<*>> = mutableSetOf()
     private val preferencesProvider = OCSharedPreferencesProvider(appContext)
 
+    private const val BIOMETRIC_HAS_FAILED = "BIOMETRIC_HAS_FAILED"
+
     fun onActivityStarted(activity: Activity) {
         if (!exemptOfPatternActivities.contains(activity.javaClass) && patternShouldBeRequested()) {
 
@@ -79,15 +82,21 @@ object PatternManager {
     fun isPatternEnabled(): Boolean =
         preferencesProvider.getBoolean(PatternActivity.PREFERENCE_SET_PATTERN, false)
 
-    private fun askUserForPattern(activity: Activity) {
+    private fun askUserForPattern(activity: Activity, biometricHasFailed: Boolean = false) {
         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
+            putExtra(BIOMETRIC_HAS_FAILED, biometricHasFailed)
         }
         activity.startActivity(i)
     }
 
-    fun onBiometricCancelled(activity: Activity) {
-        askUserForPattern(activity)
+    fun onBiometricCancelled(activity: Activity, biometricCanceledManually: Boolean = false) {
+        if (biometricCanceledManually) {
+            askUserForPattern(activity)
+        } else {
+            // Biometric unlock has failed
+            askUserForPattern(activity, true)
+        }
     }
 }