diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-10-02 11:35:53 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2020-10-02 11:35:53 +0200 |
| commit | 1dc74b171c690dd480953d49dfb19b04056e30db (patch) | |
| tree | a15d2dbb8bacefc5176b694a69b98331c625c1d4 | |
| parent | 9266487fe572e939170d58ab2a5c2a0e138ffbc1 (diff) | |
build: upgrade AndroidX biometric
The BiometricConstants class was removed and these were folded into
BiometricPrompt.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle index 710ce996..18f2d0f5 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { annotationsVersion = '1.1.0' appcompatVersion = '1.2.0' bintrayPluginVersion = '1.8.5' - biometricVersion = '1.1.0-alpha02' + biometricVersion = '1.1.0-beta01' collectionVersion = '1.1.0' constraintLayoutVersion = '2.0.1' coordinatorLayoutVersion = '1.1.0' diff --git a/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt b/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt index 677737d8..7d95a453 100644 --- a/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt +++ b/ui/src/main/java/com/wireguard/android/util/BiometricAuthenticator.kt @@ -9,7 +9,6 @@ import android.os.Handler import android.os.Looper import android.util.Log import androidx.annotation.StringRes -import androidx.biometric.BiometricConstants import androidx.biometric.BiometricManager import androidx.biometric.BiometricManager.Authenticators import androidx.biometric.BiometricPrompt @@ -41,12 +40,12 @@ object BiometricAuthenticator { super.onAuthenticationError(errorCode, errString) Log.d(TAG, "BiometricAuthentication error: errorCode=$errorCode, msg=$errString") callback(when (errorCode) { - BiometricConstants.ERROR_CANCELED, BiometricConstants.ERROR_USER_CANCELED, - BiometricConstants.ERROR_NEGATIVE_BUTTON -> { + BiometricPrompt.ERROR_CANCELED, BiometricPrompt.ERROR_USER_CANCELED, + BiometricPrompt.ERROR_NEGATIVE_BUTTON -> { Result.Cancelled } - BiometricConstants.ERROR_HW_NOT_PRESENT, BiometricConstants.ERROR_HW_UNAVAILABLE, - BiometricConstants.ERROR_NO_BIOMETRICS, BiometricConstants.ERROR_NO_DEVICE_CREDENTIAL -> { + BiometricPrompt.ERROR_HW_NOT_PRESENT, BiometricPrompt.ERROR_HW_UNAVAILABLE, + BiometricPrompt.ERROR_NO_BIOMETRICS, BiometricPrompt.ERROR_NO_DEVICE_CREDENTIAL -> { Result.HardwareUnavailableOrDisabled } else -> Result.Failure(errorCode, fragment.getString(R.string.biometric_auth_error_reason, errString)) |