jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for biometrics (not only Fingerprint)

This commit is contained in:
Benoit Marty 2020-08-18 18:24:01 +02:00 committed by Benoit Marty
parent e76c32b74e
commit 4cba1388f9
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -42,7 +42,7 @@ allprojects {
// PhotoView // PhotoView
includeGroupByRegex 'com\\.github\\.chrisbanes' includeGroupByRegex 'com\\.github\\.chrisbanes'
// PFLockScreen-Android // PFLockScreen-Android
includeGroupByRegex 'com\\.github\\.ganfra' includeGroupByRegex 'com\\.github\\.vector-im'
} }
} }
maven { maven {

2
vector/build.gradle
View File

@ -346,7 +346,7 @@ dependencies {
implementation 'me.saket:better-link-movement-method:2.2.0' implementation 'me.saket:better-link-movement-method:2.2.0'
implementation 'com.google.android:flexbox:1.1.1' implementation 'com.google.android:flexbox:1.1.1'
implementation "androidx.autofill:autofill:$autofill_version" implementation "androidx.autofill:autofill:$autofill_version"
implementation 'com.github.ganfra:PFLockScreen-Android:1.0.0-beta8' implementation 'com.github.vector-im:PFLockScreen-Android:1.0.0-beta9'
// Custom Tab // Custom Tab
implementation 'androidx.browser:browser:1.2.0' implementation 'androidx.browser:browser:1.2.0'

12
vector/src/main/java/im/vector/app/features/pin/PinFragment.kt
View File

@ -61,7 +61,7 @@ class PinFragment @Inject constructor(
val encodedPin = pinCodeStore.getEncodedPin() ?: return val encodedPin = pinCodeStore.getEncodedPin() ?: return
val authFragment = PFLockScreenFragment() val authFragment = PFLockScreenFragment()
val builder = PFFLockScreenConfiguration.Builder(requireContext()) val builder = PFFLockScreenConfiguration.Builder(requireContext())
.setUseFingerprint(true) .setUseBiometric(true)
.setTitle(getString(R.string.auth_pin_confirm_to_disable_title)) .setTitle(getString(R.string.auth_pin_confirm_to_disable_title))
.setClearCodeOnError(true) .setClearCodeOnError(true)
.setMode(PFFLockScreenConfiguration.MODE_AUTH) .setMode(PFFLockScreenConfiguration.MODE_AUTH)
@ -71,7 +71,7 @@ class PinFragment @Inject constructor(
override fun onPinLoginFailed() { override fun onPinLoginFailed() {
} }
override fun onFingerprintSuccessful() { override fun onBiometricAuthSuccessful() {
lifecycleScope.launch { lifecycleScope.launch {
pinCodeStore.deleteEncodedPin() pinCodeStore.deleteEncodedPin()
vectorBaseActivity.setResult(Activity.RESULT_OK) vectorBaseActivity.setResult(Activity.RESULT_OK)
@ -79,7 +79,7 @@ class PinFragment @Inject constructor(
} }
} }
override fun onFingerprintLoginFailed() { override fun onBiometricAuthLoginFailed() {
} }
override fun onCodeInputSuccessful() { override fun onCodeInputSuccessful() {
@ -122,7 +122,7 @@ class PinFragment @Inject constructor(
val encodedPin = pinCodeStore.getEncodedPin() ?: return val encodedPin = pinCodeStore.getEncodedPin() ?: return
val authFragment = PFLockScreenFragment() val authFragment = PFLockScreenFragment()
val builder = PFFLockScreenConfiguration.Builder(requireContext()) val builder = PFFLockScreenConfiguration.Builder(requireContext())
.setUseFingerprint(true) .setUseBiometric(true)
.setTitle(getString(R.string.auth_pin_title)) .setTitle(getString(R.string.auth_pin_title))
.setLeftButton(getString(R.string.auth_pin_forgot)) .setLeftButton(getString(R.string.auth_pin_forgot))
.setClearCodeOnError(true) .setClearCodeOnError(true)
@ -136,12 +136,12 @@ class PinFragment @Inject constructor(
override fun onPinLoginFailed() { override fun onPinLoginFailed() {
} }
override fun onFingerprintSuccessful() { override fun onBiometricAuthSuccessful() {
vectorBaseActivity.setResult(Activity.RESULT_OK) vectorBaseActivity.setResult(Activity.RESULT_OK)
vectorBaseActivity.finish() vectorBaseActivity.finish()
} }
override fun onFingerprintLoginFailed() { override fun onBiometricAuthLoginFailed() {
} }
override fun onCodeInputSuccessful() { override fun onCodeInputSuccessful() {