wbrawner/Simple-Commons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create a unified API that hides SecurityDialog and BiometricPrompt

Browse source
This commit is contained in:
Andrii Chubko 2021-08-24 19:21:14 +03:00
parent 16731c9ba5
commit 615349768d
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
View file

@ -863,14 +863,41 @@ fun BaseSimpleActivity.getFileOutputStreamSync(path: String, mimeType: String, p
}
}
fun FragmentActivity.showBiometricPrompt(successCallback: (BiometricPrompt.AuthenticationResult) -> Unit) {
fun FragmentActivity.performSecurityCheck(
protectionType: Int,
requiredHash: String,
successCallback: ((String, Int) -> Unit)? = null,
failureCallback: (() -> Unit)? = null
) {
if (protectionType == PROTECTION_FINGERPRINT && isTargetSdkVersion30Plus()) {
showBiometricPrompt(successCallback, failureCallback)
} else {
SecurityDialog(
activity = this,
requiredHash = requiredHash,
showTabIndex = protectionType,
callback = { hash, type, success ->
if (success) {
successCallback?.invoke(hash, type)
} else {
failureCallback?.invoke()
}
}
)
}
}
fun FragmentActivity.showBiometricPrompt(
successCallback: ((String, Int) -> Unit)? = null,
failureCallback: (() -> Unit)? = null
) {
Class2BiometricAuthPrompt.Builder(getText(R.string.authenticate), getText(R.string.cancel))
.build()
.startAuthentication(
AuthPromptHost(this),
object : AuthPromptCallback() {
override fun onAuthenticationSucceeded(activity: FragmentActivity?, result: BiometricPrompt.AuthenticationResult) {
successCallback(result)
successCallback?.invoke("", PROTECTION_FINGERPRINT)
}
override fun onAuthenticationError(activity: FragmentActivity?, errorCode: Int, errString: CharSequence) {
@ -878,10 +905,12 @@ fun FragmentActivity.showBiometricPrompt(successCallback: (BiometricPrompt.Authe
if (!isCanceledByUser) {
toast(errString.toString())
}
failureCallback?.invoke()
}
override fun onAuthenticationFailed(activity: FragmentActivity?) {
toast(R.string.authentication_failed)
failureCallback?.invoke()
}
}
)

4
commons/src/main/kotlin/com/simplemobiletools/commons/views/BiometricIdTab.kt
View file

@ -20,9 +20,7 @@ class BiometricIdTab(context: Context, attrs: AttributeSet) : ConstraintLayout(c
context.updateTextColors(biometric_lock_holder)
open_biometric_dialog.setOnClickListener {
biometricPromptHost.activity?.showBiometricPrompt {
hashListener.receivedHash("", PROTECTION_FINGERPRINT)
}
biometricPromptHost.activity?.showBiometricPrompt(successCallback = hashListener::receivedHash)
}
}