diff options
| -rw-r--r-- | .editorconfig | 2 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/UserPreference.kt | 7 | ||||
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt | 9 |
3 files changed, 10 insertions, 8 deletions
diff --git a/.editorconfig b/.editorconfig index aa68b484..06bd1e00 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,7 +12,7 @@ insert_final_newline = true [*.{java,kt,kts,xml}] indent_size = 4 -ij_continuation_indent_size = 2 +ij_continuation_indent_size = 4 [*.{kt,kts}] kotlin_imports_layout=ascii diff --git a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt index 35c9e248..fa325f9c 100644 --- a/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt +++ b/app/src/main/java/com/zeapo/pwdstore/UserPreference.kt @@ -24,7 +24,6 @@ import androidx.activity.result.contract.ActivityResultContracts.OpenDocument import androidx.activity.result.contract.ActivityResultContracts.OpenDocumentTree import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatTextView -import androidx.biometric.BiometricManager import androidx.core.content.edit import androidx.core.content.getSystemService import androidx.documentfile.provider.DocumentFile @@ -281,9 +280,9 @@ class UserPreference : AppCompatActivity() { findPreference<CheckBoxPreference>(PreferenceKeys.ENABLE_DEBUG_LOGGING)?.isVisible = !BuildConfig.ENABLE_DEBUG_FEATURES findPreference<CheckBoxPreference>(PreferenceKeys.BIOMETRIC_AUTH)?.apply { - val isFingerprintSupported = BiometricManager.from(requireContext()) - .canAuthenticate(BiometricManager.Authenticators.DEVICE_CREDENTIAL) == BiometricManager.BIOMETRIC_SUCCESS - if (!isFingerprintSupported) { + val canAuthenticate = BiometricAuthenticator.canAuthenticate(prefsActivity) + + if (!canAuthenticate) { isEnabled = false isChecked = false summary = getString(R.string.biometric_auth_summary_error) diff --git a/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt b/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt index d7ecb4cd..a1b4a279 100644 --- a/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt +++ b/app/src/main/java/com/zeapo/pwdstore/utils/BiometricAuthenticator.kt @@ -20,6 +20,7 @@ import com.zeapo.pwdstore.R object BiometricAuthenticator { 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() @@ -28,6 +29,10 @@ object BiometricAuthenticator { object Cancelled : Result() } + fun canAuthenticate(activity: FragmentActivity): Boolean { + return BiometricManager.from(activity).canAuthenticate(validAuthenticators) == BiometricManager.BIOMETRIC_SUCCESS + } + fun authenticate( activity: FragmentActivity, @StringRes dialogTitleRes: Int = R.string.biometric_prompt_title, @@ -60,10 +65,8 @@ object BiometricAuthenticator { callback(Result.Success(result.cryptoObject)) } } - val validAuthenticators = Authenticators.DEVICE_CREDENTIAL or Authenticators.BIOMETRIC_WEAK - val canAuth = BiometricManager.from(activity).canAuthenticate(validAuthenticators) == BiometricManager.BIOMETRIC_SUCCESS val deviceHasKeyguard = activity.getSystemService<KeyguardManager>()?.isDeviceSecure == true - if (canAuth || deviceHasKeyguard) { + if (canAuthenticate(activity) || deviceHasKeyguard) { val promptInfo = BiometricPrompt.PromptInfo.Builder() .setTitle(activity.getString(dialogTitleRes)) .setAllowedAuthenticators(validAuthenticators) |