Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix biometric lock issue on devices running Android 10 or 9 #173

Merged
merged 3 commits into from
Dec 23, 2024
Merged

Fix biometric lock issue on devices running Android 10 or 9 #173

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a60573
fixed BiometricLock on older versions
PranshulGG Dec 23, 2024
3eb53c6
simplify biometricprompt version check
PranshulGG Dec 23, 2024
4561bd6
removed setNegativeButton
PranshulGG Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 53 additions & 7 deletions app/src/main/java/com/philkes/notallyx/utils/security/LockUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,64 @@ private fun showBiometricOrPinPrompt(
onFailure: () -> Unit,
) {
when {
Build.VERSION.SDK_INT >= Build.VERSION_CODES.P -> {
Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> {
// Android 11+ with BiometricPrompt and Authenticators
val prompt = BiometricPrompt.Builder(context)
.apply {
setTitle(context.getString(titleResId))
descriptionResId?.let {
setDescription(context.getString(descriptionResId))
}
setAllowedAuthenticators(
BiometricManager.Authenticators.BIOMETRIC_STRONG or
BiometricManager.Authenticators.DEVICE_CREDENTIAL
)
}
.build()
val cipher =
if (isForDecrypt) {
getInitializedCipherForDecryption(iv = cipherIv!!)
} else {
getInitializedCipherForEncryption()
}
prompt.authenticate(
BiometricPrompt.CryptoObject(cipher),
getCancellationSignal(context),
context.mainExecutor,
object : BiometricPrompt.AuthenticationCallback() {
override fun onAuthenticationSucceeded(
result: BiometricPrompt.AuthenticationResult?
) {
super.onAuthenticationSucceeded(result)
onSuccess.invoke(result!!.cryptoObject!!.cipher)
}

override fun onAuthenticationFailed() {
super.onAuthenticationFailed()
onFailure.invoke()
}

override fun onAuthenticationError(errorCode: Int, errString: CharSequence?) {
super.onAuthenticationError(errorCode, errString)
onFailure.invoke()
}
},
)
}
Build.VERSION.SDK_INT == Build.VERSION_CODES.Q -> {
// Android 10: Use BiometricPrompt without Authenticators
val prompt =
BiometricPrompt.Builder(context)
.apply {
setTitle(context.getString(titleResId))
descriptionResId?.let {
setDescription(context.getString(descriptionResId))
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
setAllowedAuthenticators(
BiometricManager.Authenticators.BIOMETRIC_STRONG or
BiometricManager.Authenticators.DEVICE_CREDENTIAL
)
setNegativeButton(
context.getString(R.string.cancel),
context.mainExecutor
) { _, _ ->
onFailure.invoke()
}
}
.build()
Expand Down Expand Up @@ -115,12 +160,13 @@ private fun showBiometricOrPinPrompt(
},
)
}

Build.VERSION.SDK_INT >= Build.VERSION_CODES.M -> {
val fingerprintManager =
ContextCompat.getSystemService(context, FingerprintManager::class.java)
if (
fingerprintManager?.isHardwareDetected == true &&
fingerprintManager.hasEnrolledFingerprints()
fingerprintManager.hasEnrolledFingerprints()
) {
val cipher =
if (isForDecrypt) {
Expand Down