Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: upgrade AndroidX biometric

Browse Source 
The BiometricConstants class was removed and these were folded into
BiometricPrompt.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-10-02 11:35:53 +02:00
parent 9266487fe5
commit 1dc74b171c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -5,7 +5,7 @@ buildscript {
annotationsVersion = '1.1.0' annotationsVersion = '1.1.0'
appcompatVersion = '1.2.0' appcompatVersion = '1.2.0'
bintrayPluginVersion = '1.8.5' bintrayPluginVersion = '1.8.5'
biometricVersion = '1.1.0-alpha02' biometricVersion = '1.1.0-beta01'
collectionVersion = '1.1.0' collectionVersion = '1.1.0'
constraintLayoutVersion = '2.0.1' constraintLayoutVersion = '2.0.1'
coordinatorLayoutVersion = '1.1.0' coordinatorLayoutVersion = '1.1.0'

9
ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt
View File

@ -9,7 +9,6 @@ import android.os.Handler
import android.os.Looper import android.os.Looper
import android.util.Log import android.util.Log
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.biometric.BiometricConstants
import androidx.biometric.BiometricManager import androidx.biometric.BiometricManager
import androidx.biometric.BiometricManager.Authenticators import androidx.biometric.BiometricManager.Authenticators
import androidx.biometric.BiometricPrompt import androidx.biometric.BiometricPrompt
@ -41,12 +40,12 @@ object BiometricAuthenticator {
super.onAuthenticationError(errorCode, errString) super.onAuthenticationError(errorCode, errString)
Log.d(TAG, "BiometricAuthentication error: errorCode=$errorCode, msg=$errString") Log.d(TAG, "BiometricAuthentication error: errorCode=$errorCode, msg=$errString")
callback(when (errorCode) { callback(when (errorCode) {
BiometricConstants.ERROR_CANCELED, BiometricConstants.ERROR_USER_CANCELED, BiometricPrompt.ERROR_CANCELED, BiometricPrompt.ERROR_USER_CANCELED,
BiometricConstants.ERROR_NEGATIVE_BUTTON -> { BiometricPrompt.ERROR_NEGATIVE_BUTTON -> {
Result.Cancelled Result.Cancelled
} }
BiometricConstants.ERROR_HW_NOT_PRESENT, BiometricConstants.ERROR_HW_UNAVAILABLE, BiometricPrompt.ERROR_HW_NOT_PRESENT, BiometricPrompt.ERROR_HW_UNAVAILABLE,
BiometricConstants.ERROR_NO_BIOMETRICS, BiometricConstants.ERROR_NO_DEVICE_CREDENTIAL -> { BiometricPrompt.ERROR_NO_BIOMETRICS, BiometricPrompt.ERROR_NO_DEVICE_CREDENTIAL -> {
Result.HardwareUnavailableOrDisabled Result.HardwareUnavailableOrDisabled
} }
else -> Result.Failure(errorCode, fragment.getString(R.string.biometric_auth_error_reason, errString)) else -> Result.Failure(errorCode, fragment.getString(R.string.biometric_auth_error_reason, errString))