refactor: eliminate one level of nesting from BiometricAuthenticator

1 files changed, 29 insertions, 27 deletions

diff --git a/app/src/main/java/app/passwordstore/util/auth/BiometricAuthenticator.kt b/app/src/main/java/app/passwordstore/util/auth/BiometricAuthenticator.kt
index 4b91bee6..b81e9a16 100644
--- a/app/src/main/java/app/passwordstore/util/auth/BiometricAuthenticator.kt
+++ b/app/src/main/java/app/passwordstore/util/auth/BiometricAuthenticator.kt
@@ -61,42 +61,44 @@ object BiometricAuthenticator {
         override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
           super.onAuthenticationError(errorCode, errString)
           logcat(TAG) { "onAuthenticationError(errorCode=$errorCode, msg=$errString)" }
-          callback(
-            when (errorCode) {
-              BiometricPrompt.ERROR_CANCELED,
-              BiometricPrompt.ERROR_USER_CANCELED,
-              BiometricPrompt.ERROR_NEGATIVE_BUTTON -> {
-                Result.Cancelled
-              }
-              BiometricPrompt.ERROR_HW_NOT_PRESENT,
-              BiometricPrompt.ERROR_HW_UNAVAILABLE,
-              BiometricPrompt.ERROR_NO_BIOMETRICS,
-              BiometricPrompt.ERROR_NO_DEVICE_CREDENTIAL -> {
-                Result.HardwareUnavailableOrDisabled
-              }
-              BiometricPrompt.ERROR_LOCKOUT,
-              BiometricPrompt.ERROR_LOCKOUT_PERMANENT,
-              BiometricPrompt.ERROR_NO_SPACE,
-              BiometricPrompt.ERROR_TIMEOUT,
-              BiometricPrompt.ERROR_VENDOR -> {
+          when (errorCode) {
+            BiometricPrompt.ERROR_CANCELED,
+            BiometricPrompt.ERROR_USER_CANCELED,
+            BiometricPrompt.ERROR_NEGATIVE_BUTTON -> {
+              callback(Result.Cancelled)
+            }
+            BiometricPrompt.ERROR_HW_NOT_PRESENT,
+            BiometricPrompt.ERROR_HW_UNAVAILABLE,
+            BiometricPrompt.ERROR_NO_BIOMETRICS,
+            BiometricPrompt.ERROR_NO_DEVICE_CREDENTIAL -> {
+              callback(Result.HardwareUnavailableOrDisabled)
+            }
+            BiometricPrompt.ERROR_LOCKOUT,
+            BiometricPrompt.ERROR_LOCKOUT_PERMANENT,
+            BiometricPrompt.ERROR_NO_SPACE,
+            BiometricPrompt.ERROR_TIMEOUT,
+            BiometricPrompt.ERROR_VENDOR -> {
+              callback(
                 Result.Failure(
                   errorCode,
                   activity.getString(R.string.biometric_auth_error_reason, errString)
                 )
-              }
-              BiometricPrompt.ERROR_UNABLE_TO_PROCESS -> {
-                Result.Retry
-              }
-              // We cover all guaranteed values above, but [errorCode] is still an Int
-              // at the end of the day so a catch-all else will always be required.
-              else -> {
+              )
+            }
+            BiometricPrompt.ERROR_UNABLE_TO_PROCESS -> {
+              callback(Result.Retry)
+            }
+            // We cover all guaranteed values above, but [errorCode] is still an Int
+            // at the end of the day so a catch-all else will always be required.
+            else -> {
+              callback(
                 Result.Failure(
                   errorCode,
                   activity.getString(R.string.biometric_auth_error_reason, errString)
                 )
-              }
+              )
             }
-          )
+          }
         }
 
         override fun onAuthenticationFailed() {