From 5b247575c80bc9b788d14f80adddd8fcc38f55eb Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Sat, 5 Dec 2020 12:09:07 +0100
Subject: [PATCH] Fix small bugs #805

---
 CHANGELOG                                     |  1 +
 .../biometric/AdvancedUnlockedManager.kt      | 36 ++++++++++++++-----
 .../metadata/android/en-US/changelogs/47.txt  |  3 +-
 .../metadata/android/fr-FR/changelogs/47.txt  |  3 +-
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index cc80ab03e..db0f9f004 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ KeePassDX(2.9.3)
  * Remove default database parameter when the file is no longer accessible #803
  * Move OTP button to the first view level in Magikeyboard #587
  * Tooltips for Magikeyboard #586
+ * Fix small bugs #805
 
 KeePassDX(2.9.2)
  * Managing OTP links from QR applications #556
diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
index daf882b38..88288988b 100644
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockedManager.kt
@@ -200,13 +200,35 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         advancedUnlockInfoView?.setIconViewClickListener(false, null)
     }
 
+    @Suppress("DEPRECATION")
+    private fun openBiometricSetting() {
+        advancedUnlockInfoView?.setIconViewClickListener(false) {
+            when {
+                /*
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.R -> {
+                    // Need parameters and result parser
+                    context.startActivityForResult(Intent(Settings.ACTION_BIOMETRIC_ENROLL),
+                            ACTION_BIOMETRIC_ENROLL_REQUEST_CODE)
+                }
+                Build.VERSION.SDK_INT >= Build.VERSION_CODES.P -> {
+                    // Not working with Xiaomi... (crash after trying to enroll fingerprint
+                    context.startActivityForResult(Intent(Settings.ACTION_FINGERPRINT_ENROLL),
+                            ACTION_FINGERPRINT_ENROLL_REQUEST_CODE)
+                }
+                */
+                else -> {
+                    // ACTION_SECURITY_SETTINGS do not contains fingerprint enrollment in Xiaomi...
+                    context.startActivity(Intent(Settings.ACTION_SETTINGS))
+                }
+            }
+        }
+    }
+
     private fun initSecurityUpdateRequired() {
         showFingerPrintViews(true)
         setAdvancedUnlockedTitleView(R.string.biometric_security_update_required)
 
-        advancedUnlockInfoView?.setIconViewClickListener(false) {
-            context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
-        }
+        openBiometricSetting()
     }
 
     private fun initNotConfigured() {
@@ -214,18 +236,14 @@ class AdvancedUnlockedManager(var context: FragmentActivity,
         setAdvancedUnlockedTitleView(R.string.configure_biometric)
         setAdvancedUnlockedMessageView("")
 
-        advancedUnlockInfoView?.setIconViewClickListener(false) {
-            context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
-        }
+        openBiometricSetting()
     }
 
     private fun initKeyManagerNotAvailable() {
         showFingerPrintViews(true)
         setAdvancedUnlockedTitleView(R.string.keystore_not_accessible)
 
-        advancedUnlockInfoView?.setIconViewClickListener(false) {
-            context.startActivity(Intent(Settings.ACTION_SECURITY_SETTINGS))
-        }
+        openBiometricSetting()
     }
 
     private fun initWaitData() {
diff --git a/fastlane/metadata/android/en-US/changelogs/47.txt b/fastlane/metadata/android/en-US/changelogs/47.txt
index 884192f20..8c9cc192c 100644
--- a/fastlane/metadata/android/en-US/changelogs/47.txt
+++ b/fastlane/metadata/android/en-US/changelogs/47.txt
@@ -1,4 +1,5 @@
  * Unlock database by device credentials (PIN/Password/Pattern) #779 #102
  * Remove default database parameter when the file is no longer accessible #803
  * Move OTP button to the first view level in Magikeyboard #587
- * Tooltips for Magikeyboard #586
\ No newline at end of file
+ * Tooltips for Magikeyboard #586
+ * Fix small bugs #805
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/47.txt b/fastlane/metadata/android/fr-FR/changelogs/47.txt
index 498508345..47c62097b 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/47.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/47.txt
@@ -1,4 +1,5 @@
  * Déverouillage de base de données avec identifiants de l'appareil (PIN/Password/Pattern) #779 #102
  * Supprimer le parmètre de base de données par défaut quand le fichier n'est plus accessible #803
  * Déplacer le bouton OTP vers le premier niveau de vue dans le Magiclavier #587
- * Info-bulles pour le Magiclavier #586
\ No newline at end of file
+ * Info-bulles pour le Magiclavier #586
+ * Correction petits bugs #805
\ No newline at end of file