1 files changed, 57 insertions, 49 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt b/app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt
index eba61d77..c3655298 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt
@@ -18,61 +18,69 @@ import dev.msfjarvis.aps.R
 
 object BiometricAuthenticator {
 
-    private const val TAG = "BiometricAuthenticator"
-    private const val validAuthenticators = Authenticators.DEVICE_CREDENTIAL or Authenticators.BIOMETRIC_WEAK
+  private const val TAG = "BiometricAuthenticator"
+  private const val validAuthenticators = Authenticators.DEVICE_CREDENTIAL or Authenticators.BIOMETRIC_WEAK
 
-    sealed class Result {
-        data class Success(val cryptoObject: BiometricPrompt.CryptoObject?) : Result()
-        data class Failure(val code: Int?, val message: CharSequence) : Result()
-        object HardwareUnavailableOrDisabled : Result()
-        object Cancelled : Result()
-    }
-
-    fun canAuthenticate(activity: FragmentActivity): Boolean {
-        return BiometricManager.from(activity).canAuthenticate(validAuthenticators) == BiometricManager.BIOMETRIC_SUCCESS
-    }
+  sealed class Result {
+    data class Success(val cryptoObject: BiometricPrompt.CryptoObject?) : Result()
+    data class Failure(val code: Int?, val message: CharSequence) : Result()
+    object HardwareUnavailableOrDisabled : Result()
+    object Cancelled : Result()
+  }
 
-    fun authenticate(
-        activity: FragmentActivity,
-        @StringRes dialogTitleRes: Int = R.string.biometric_prompt_title,
-        callback: (Result) -> Unit
-    ) {
-        val authCallback = object : BiometricPrompt.AuthenticationCallback() {
-            override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
-                super.onAuthenticationError(errorCode, errString)
-                tag(TAG).d { "BiometricAuthentication error: 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
-                    }
-                    else -> Result.Failure(errorCode, activity.getString(R.string.biometric_auth_error_reason, errString))
-                })
-            }
+  fun canAuthenticate(activity: FragmentActivity): Boolean {
+    return BiometricManager.from(activity).canAuthenticate(validAuthenticators) == BiometricManager.BIOMETRIC_SUCCESS
+  }
 
-            override fun onAuthenticationFailed() {
-                super.onAuthenticationFailed()
-                callback(Result.Failure(null, activity.getString(R.string.biometric_auth_error)))
+  fun authenticate(
+    activity: FragmentActivity,
+    @StringRes dialogTitleRes: Int = R.string.biometric_prompt_title,
+    callback: (Result) -> Unit
+  ) {
+    val authCallback =
+      object : BiometricPrompt.AuthenticationCallback() {
+        override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+          super.onAuthenticationError(errorCode, errString)
+          tag(TAG).d { "BiometricAuthentication error: 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
+              }
+              else -> Result.Failure(errorCode, activity.getString(R.string.biometric_auth_error_reason, errString))
             }
+          )
+        }
 
-            override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
-                super.onAuthenticationSucceeded(result)
-                callback(Result.Success(result.cryptoObject))
-            }
+        override fun onAuthenticationFailed() {
+          super.onAuthenticationFailed()
+          callback(Result.Failure(null, activity.getString(R.string.biometric_auth_error)))
         }
-        val deviceHasKeyguard = activity.getSystemService<KeyguardManager>()?.isDeviceSecure == true
-        if (canAuthenticate(activity) || deviceHasKeyguard) {
-            val promptInfo = BiometricPrompt.PromptInfo.Builder()
-                .setTitle(activity.getString(dialogTitleRes))
-                .setAllowedAuthenticators(validAuthenticators)
-                .build()
-            BiometricPrompt(activity, ContextCompat.getMainExecutor(activity.applicationContext), authCallback).authenticate(promptInfo)
-        } else {
-            callback(Result.HardwareUnavailableOrDisabled)
+
+        override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+          super.onAuthenticationSucceeded(result)
+          callback(Result.Success(result.cryptoObject))
         }
+      }
+    val deviceHasKeyguard = activity.getSystemService<KeyguardManager>()?.isDeviceSecure == true
+    if (canAuthenticate(activity) || deviceHasKeyguard) {
+      val promptInfo =
+        BiometricPrompt.PromptInfo.Builder()
+          .setTitle(activity.getString(dialogTitleRes))
+          .setAllowedAuthenticators(validAuthenticators)
+          .build()
+      BiometricPrompt(activity, ContextCompat.getMainExecutor(activity.applicationContext), authCallback)
+        .authenticate(promptInfo)
+    } else {
+      callback(Result.HardwareUnavailableOrDisabled)
     }
+  }
 }