From 81be3988c83ad9f29ec043cfd6f1b7559407b0f2 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Tue, 30 Jul 2024 17:19:44 +0530
Subject: [PATCH] fix: re-enable biometric lock feature

Fixes #2802
---
 .../passwordstore/ui/settings/GeneralSettings.kt  | 15 +++++++++------
 app/src/main/res/values/strings.xml               |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt b/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
index 6044b5a8..4e42bda8 100644
--- a/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
+++ b/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt
@@ -6,6 +6,7 @@
 package app.passwordstore.ui.settings
 
 import android.content.pm.ShortcutManager
+import android.os.Build
 import androidx.core.content.edit
 import androidx.core.content.getSystemService
 import androidx.fragment.app.FragmentActivity
@@ -65,15 +66,17 @@ class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider
         defaultValue = false
       }
 
-      // val canAuthenticate = BiometricAuthenticator.canAuthenticate(activity)
+      // See https://github.com/android-password-store/Android-Password-Store/issues/2802
+      val disableAuth = Build.VERSION.SDK_INT == Build.VERSION_CODES.UPSIDE_DOWN_CAKE
+      val canAuthenticate = BiometricAuthenticator.canAuthenticate(activity)
       switch(PreferenceKeys.BIOMETRIC_AUTH_2) {
         titleRes = R.string.pref_biometric_auth_title
         defaultValue = false
-        enabled = false
-        // summaryRes =
-        //   if (canAuthenticate) R.string.pref_biometric_auth_summary
-        //   else R.string.pref_biometric_auth_summary_error
-        summary = "Temporarily disabled due to a bug, see issue 2802"
+        enabled = !disableAuth
+        summaryRes =
+          if (disableAuth) R.string.pref_biometric_auth_summary_disabled_platform
+          else if (canAuthenticate) R.string.pref_biometric_auth_summary
+          else R.string.pref_biometric_auth_summary_error
         onClick {
           enabled = false
           val isChecked = checked
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bddc831d..a971006e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -256,6 +256,7 @@
   <string name="pref_biometric_auth_title">Enable biometric authentication</string>
   <string name="pref_biometric_auth_summary">When enabled, Password Store will prompt you for your fingerprint when launching the app</string>
   <string name="pref_biometric_auth_summary_error">Fingerprint hardware not accessible or missing</string>
+  <string name="pref_biometric_auth_summary_disabled_platform">Feature unavailable due to a platform bug</string>
   <string name="pref_title_openkeystore_clear_keyid">Clear remembered OpenKeystore SSH Key ID</string>
   <string name="your_public_key">Your public key</string>
   <string name="error_generate_ssh_key">Error while trying to generate the ssh-key</string>