github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-06-08 23:16:33 -05:00
Code Issues 2.1k Packages Projects Releases 127 Wiki Activity

Use valid authenticators on Android Q and below (#77)

Browse Source
This commit is contained in:
Patrick Honkonen
2024-05-01 21:20:29 -04:00
committed by GitHub
parent de9aebbda9
commit 26c22295fc
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/biometrics/BiometricsManagerImpl.kt
View File

@@ -1,6 +1,7 @@
package com.bitwarden.authenticator.ui.platform.manager.biometrics
import android.app.Activity
import android.os.Build
import androidx.biometric.BiometricManager
import androidx.biometric.BiometricManager.Authenticators
import androidx.biometric.BiometricPrompt
@@ -18,8 +19,20 @@ class BiometricsManagerImpl(
private val fragmentActivity: FragmentActivity get() = activity as FragmentActivity
private val allowedAuthenticators: Int
get() {
// [Authenticators.DEVICE_CREDENTIAL or Authenticators.BIOMETRIC_STRONG] is not a valid
// combination prior to SDK version 30 so we use
// [Authenticators.DEVICE_CREDENTIAL or Authenticators.BIOMETRIC_WEAK] instead.
return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
Authenticators.DEVICE_CREDENTIAL or Authenticators.BIOMETRIC_WEAK
} else {
Authenticators.DEVICE_CREDENTIAL or Authenticators.BIOMETRIC_STRONG
}
}
override val isBiometricsSupported: Boolean
get() = when (biometricManager.canAuthenticate(Authenticators.BIOMETRIC_STRONG)) {
get() = when (biometricManager.canAuthenticate(allowedAuthenticators)) {
BiometricManager.BIOMETRIC_SUCCESS -> true
BiometricManager.BIOMETRIC_STATUS_UNKNOWN,
BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED,
@@ -78,9 +91,7 @@ class BiometricsManagerImpl(
val promptInfo = BiometricPrompt.PromptInfo.Builder()
.setTitle(activity.getString(R.string.bitwarden_authenticator))
.setDescription(activity.getString(R.string.biometrics_direction))
.setAllowedAuthenticators(
Authenticators.BIOMETRIC_STRONG or Authenticators.DEVICE_CREDENTIAL
)
.setAllowedAuthenticators(allowedAuthenticators)
.build()
biometricPrompt.authenticate(promptInfo)