From ac9bb9b6667993ba2fc97582563e246c2badfe7b Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 24 Jul 2025 19:41:28 +0200
Subject: [PATCH] fix: Biometric error #2081

---
 .../keepass/biometric/AdvancedUnlockFragment.kt   | 15 ++++++---------
 .../keepass/viewmodels/AdvancedUnlockViewModel.kt |  8 ++++----
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
index c7c9ae237..7b35c67f7 100644
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/AdvancedUnlockFragment.kt
@@ -20,14 +20,18 @@
 package com.kunzisoft.keepass.biometric
 
 import android.app.Activity
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
 import android.util.Log
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
 import androidx.biometric.BiometricManager
@@ -117,13 +121,6 @@ class AdvancedUnlockFragment: Fragment(), AdvancedUnlockManager.AdvancedUnlockCa
         }
     }
 
-    override fun onAttach(context: Context) {
-        super.onAttach(context)
-
-        mAdvancedUnlockEnabled = PreferencesUtil.isAdvancedUnlockEnable(context)
-        mAutoOpenPromptEnabled = PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(context)
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/viewmodels/AdvancedUnlockViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/viewmodels/AdvancedUnlockViewModel.kt
index 35b1d6b4f..e3e174e50 100644
--- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/AdvancedUnlockViewModel.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/AdvancedUnlockViewModel.kt
@@ -13,8 +13,8 @@ class AdvancedUnlockViewModel : ViewModel() {
     var allowAutoOpenBiometricPrompt : Boolean = true
     var deviceCredentialAuthSucceeded: Boolean? = null
 
-    private val _uiState = MutableStateFlow(DeviceUnlockUiStates())
-    val uiState: StateFlow<DeviceUnlockUiStates> = _uiState
+    private val _uiState = MutableStateFlow(DeviceUnlockState())
+    val uiState: StateFlow<DeviceUnlockState> = _uiState
 
     fun checkUnlockAvailability(conditionToStoreCredentialVerified: Boolean? = null) {
         _uiState.update { currentState ->
@@ -110,7 +110,7 @@ class AdvancedUnlockViewModel : ViewModel() {
     }
 }
 
-data class DeviceUnlockUiStates(
+data class DeviceUnlockState(
     val initAdvancedUnlockMode: Boolean = false,
     val databaseFileLoaded: Uri? = null,
     val isCredentialRequired: Boolean = false,
@@ -124,7 +124,7 @@ data class DeviceUnlockUiStates(
         if (this === other) return true
         if (javaClass != other?.javaClass) return false
 
-        other as DeviceUnlockUiStates
+        other as DeviceUnlockState
 
         if (initAdvancedUnlockMode != other.initAdvancedUnlockMode) return false
         if (isCredentialRequired != other.isCredentialRequired) return false