biometric

x13a · Jul 10, 2022 · 8ee1f31 · 8ee1f31
1 parent e68d9ca
commit 8ee1f31
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "me.lucky.sentry"
         minSdk 23
         targetSdk 32
-        versionCode 5
-        versionName "1.0.4"
+        versionCode 6
+        versionName "1.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/me/lucky/sentry/MainActivity.kt b/app/src/main/java/me/lucky/sentry/MainActivity.kt
@@ -31,8 +31,9 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        init()
+        init1()
         if (initBiometric()) return
+        init2()
         setup()
     }
 
@@ -70,22 +71,28 @@ class MainActivity : AppCompatActivity() {
 
             override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
                 super.onAuthenticationSucceeded(result)
+                init2()
                 setup()
             }
         })
-        prompt.authenticate(BiometricPrompt.PromptInfo.Builder()
-            .setTitle(getString(R.string.biometric_title))
-            .setConfirmationRequired(false)
-            .setAllowedAuthenticators(authenticators)
-            .build())
+        try {
+            prompt.authenticate(BiometricPrompt.PromptInfo.Builder()
+                .setTitle(getString(R.string.authentication))
+                .setConfirmationRequired(false)
+                .setAllowedAuthenticators(authenticators)
+                .build())
+        } catch (exc: Exception) { return false }
         return true
     }
 
-    private fun init() {
+    private fun init1() {
         prefs = Preferences(this)
         prefsdb = Preferences(this, encrypted = false)
         prefs.copyTo(prefsdb)
         admin = DeviceAdminManager(this)
+    }
+
+    private fun init2() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S ||
             !admin.canUsbDataSignalingBeDisabled() ||
             !admin.isDeviceOwner())

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -8,7 +8,6 @@
     tools:context=".MainActivity">
 
     <ScrollView
-        android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -5,5 +5,5 @@
     <string name="usb_data_signaling_description">When disabled, USB data connections (except from charging functions) are prohibited.</string>
     <string name="usb_data_signaling_change_failed_popup">Failed to change USB data signaling policy</string>
     <string name="max_failed_password_attempts_description">Maximum number of failed password attempts.</string>
-    <string name="biometric_title">Biometric login</string>
+    <string name="authentication">Authentication</string>
 </resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/6.txt b/fastlane/metadata/android/en-US/changelogs/6.txt
@@ -0,0 +1 @@
+biometric