diff --git a/app/build.gradle b/app/build.gradle index a9c284ad..3cce7099 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -121,8 +121,8 @@ protobuf { dependencies { def androidTestVersion = '1.3.0' - def cameraxVersion = '1.0.0-rc01' - def glideVersion = '4.11.0' + def cameraxVersion = '1.0.0-rc02' + def glideVersion = '4.12.0' def guavaVersion = '30.1' def junitVersion = '4.13.1' def libsuVersion = '3.0.2' @@ -132,11 +132,12 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.2.0' - implementation "androidx.biometric:biometric:1.0.1" + implementation "androidx.biometric:biometric:1.1.0" implementation "androidx.camera:camera-camera2:$cameraxVersion" implementation "androidx.camera:camera-lifecycle:$cameraxVersion" - implementation "androidx.camera:camera-view:1.0.0-alpha20" + implementation "androidx.camera:camera-view:1.0.0-alpha21" implementation 'androidx.cardview:cardview:1.0.0' + implementation "androidx.core:core:1.3.2" implementation 'androidx.constraintlayout:constraintlayout:2.0.4' implementation 'androidx.documentfile:documentfile:1.0.1' implementation "androidx.lifecycle:lifecycle-process:2.2.0" @@ -144,7 +145,7 @@ dependencies { implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation "androidx.viewpager2:viewpager2:1.0.0" implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1' - implementation 'com.github.avito-tech:krop:0.51' + implementation 'com.github.avito-tech:krop:0.52' implementation "com.github.bumptech.glide:annotations:${glideVersion}" implementation "com.github.bumptech.glide:glide:${glideVersion}" implementation("com.github.bumptech.glide:recyclerview-integration:${glideVersion}") { @@ -153,12 +154,12 @@ dependencies { implementation "com.github.topjohnwu.libsu:core:${libsuVersion}" implementation "com.github.topjohnwu.libsu:io:${libsuVersion}" implementation "com.google.guava:guava:${guavaVersion}-android" - implementation 'com.google.android.material:material:1.3.0-rc01' + implementation 'com.google.android.material:material:1.3.0' implementation 'com.google.protobuf:protobuf-javalite:3.14.0' implementation 'com.google.zxing:core:3.4.1' implementation "com.mikepenz:iconics-core:3.2.5" implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar' - implementation 'com.nulab-inc:zxcvbn:1.3.1' + implementation 'com.nulab-inc:zxcvbn:1.3.5' implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.psdev.licensesdialog:licensesdialog:2.1.0' // NOTE: this is kept at an old version on purpose (something in newer versions breaks the Authenticator Plus importer) @@ -180,7 +181,7 @@ dependencies { testImplementation "com.google.guava:guava:${guavaVersion}-jre" testImplementation "junit:junit:${junitVersion}" testImplementation "org.json:json:20201115" - testImplementation 'org.robolectric:robolectric:4.4' + testImplementation 'org.robolectric:robolectric:4.5.1' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' } diff --git a/app/src/main/java/com/beemdevelopment/aegis/helpers/BiometricsHelper.java b/app/src/main/java/com/beemdevelopment/aegis/helpers/BiometricsHelper.java index eab2e5e4..99b2a9a9 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/helpers/BiometricsHelper.java +++ b/app/src/main/java/com/beemdevelopment/aegis/helpers/BiometricsHelper.java @@ -2,8 +2,8 @@ package com.beemdevelopment.aegis.helpers; import android.content.Context; -import androidx.biometric.BiometricConstants; import androidx.biometric.BiometricManager; +import androidx.biometric.BiometricPrompt; public class BiometricsHelper { private BiometricsHelper() { @@ -12,16 +12,16 @@ public class BiometricsHelper { public static BiometricManager getManager(Context context) { BiometricManager manager = BiometricManager.from(context); - if (manager.canAuthenticate() == BiometricManager.BIOMETRIC_SUCCESS) { + if (manager.canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG) == BiometricManager.BIOMETRIC_SUCCESS) { return manager; } return null; } public static boolean isCanceled(int errorCode) { - return errorCode == BiometricConstants.ERROR_CANCELED - || errorCode == BiometricConstants.ERROR_USER_CANCELED - || errorCode == BiometricConstants.ERROR_NEGATIVE_BUTTON; + return errorCode == BiometricPrompt.ERROR_CANCELED + || errorCode == BiometricPrompt.ERROR_USER_CANCELED + || errorCode == BiometricPrompt.ERROR_NEGATIVE_BUTTON; } public static boolean isAvailable(Context context) {