biometric

x13a · Jul 10, 2022 · fffaa5d · fffaa5d
1 parent f2bd587
commit fffaa5d
Show file tree

Hide file tree

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

diff --git a/app/src/main/java/me/lucky/duress/MainActivity.kt b/app/src/main/java/me/lucky/duress/MainActivity.kt
@@ -33,8 +33,9 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        init()
+        init1()
         if (initBiometric()) return
+        init2()
         setup()
         if (prefs.isShowProminentDisclosure) showProminentDisclosure()
     }
@@ -50,11 +51,14 @@ class MainActivity : AppCompatActivity() {
         prefs.unregisterListener(prefsListener)
     }
 
-    private fun init() {
+    private fun init1() {
         prefs = Preferences(this)
         prefsdb = Preferences(this, encrypted = false)
         prefs.copyTo(prefsdb)
         accessibilityManager = getSystemService(AccessibilityManager::class.java)
+    }
+
+    private fun init2() {
         selectInterface()
         binding.apply {
             tabs.selectTab(tabs.getTabAt(prefs.mode))
@@ -94,15 +98,18 @@ class MainActivity : AppCompatActivity() {
 
                 override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
                     super.onAuthenticationSucceeded(result)
+                    init2()
                     setup()
                     if (prefs.isShowProminentDisclosure) showProminentDisclosure()
                 }
             })
-        prompt.authenticate(BiometricPrompt.PromptInfo.Builder()
-            .setTitle(getString(R.string.authentication))
-            .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
     }
 

diff --git a/fastlane/metadata/android/en-US/changelogs/6.txt b/fastlane/metadata/android/en-US/changelogs/6.txt
@@ -0,0 +1 @@
+biometric
diff --git a/fastlane/metadata/android/en-US/changelogs/7.txt b/fastlane/metadata/android/en-US/changelogs/7.txt
@@ -0,0 +1 @@
+biometric