From 6aff23992431ff1d66296aa00f24aaff7dcdeab3 Mon Sep 17 00:00:00 2001
From: Janik Besendorf <janik@besendorf.org>
Date: Sat, 23 Jan 2021 14:07:12 +0100
Subject: [PATCH] Fixes error with BioMetricManager

---
 .idea/dictionaries/Horst.xml                           |  8 ++++++++
 app/build.gradle                                       |  2 +-
 .../besendorf/androidsecurityscanner/MainActivity.java | 10 +++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 .idea/dictionaries/Horst.xml

diff --git a/.idea/dictionaries/Horst.xml b/.idea/dictionaries/Horst.xml
new file mode 100644
index 0000000..d477830
--- /dev/null
+++ b/.idea/dictionaries/Horst.xml
@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="Horst">
+    <words>
+      <w>verifiedbootstate</w>
+      <w>veritymode</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 31b95af..dd33aaa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,7 +29,7 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.biometric:biometric:1.0.1'
+    implementation 'androidx.biometric:biometric:1.1.0-rc01'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
diff --git a/app/src/main/java/com/besendorf/androidsecurityscanner/MainActivity.java b/app/src/main/java/com/besendorf/androidsecurityscanner/MainActivity.java
index 1a60ce8..2f8c8a8 100644
--- a/app/src/main/java/com/besendorf/androidsecurityscanner/MainActivity.java
+++ b/app/src/main/java/com/besendorf/androidsecurityscanner/MainActivity.java
@@ -81,7 +81,7 @@ public class MainActivity extends AppCompatActivity {
                 json.put("ro.boot.veritymode",getProp("ro.boot.veritymode")); //unklar
                 json.put("KeyStore",keyStorePresence());
                 json.put("Strongbox", isStrongbox());
-                json.put("FingerprintQuality", fingerprintQuality());
+                json.put("FingerprintQuality", biometricQuality());
             } catch (JSONException e) {
                 e.printStackTrace();
             }
@@ -105,12 +105,12 @@ public class MainActivity extends AppCompatActivity {
             return false;
         }
         
-        private String fingerprintQuality(){
-            if (BiometricManager.from(this).canAuthenticate(BIOMETRIC_STRONG))
+        private String biometricQuality(){
+            if (BiometricManager.from(this).canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_STRONG) == BiometricManager.BIOMETRIC_SUCCESS)
                 return "STRONG";
-            if (BiometricManager.from(this).canAuthenticate(BIOMETRIC_WEAK))
+            if (BiometricManager.from(this).canAuthenticate(BiometricManager.Authenticators.BIOMETRIC_WEAK) == BiometricManager.BIOMETRIC_SUCCESS)
                 return "WEAK";
-            if (BiometricManager.from(this).canAuthenticate(BIOMETRIC_CREDENTIAL))
+            if (BiometricManager.from(this).canAuthenticate(BiometricManager.Authenticators.DEVICE_CREDENTIAL) == BiometricManager.BIOMETRIC_SUCCESS)
                 return "CREDENTIAL";
             return null;
         } 
-- 
GitLab