From 5bdc72aa674bb22fee6d27e483b222db5125c215 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Thu, 13 Nov 2025 10:59:16 +0100
Subject: [PATCH] fix: Remembering database location #2262

---
 CHANGELOG                                     |  2 +-
 .../activities/FileDatabaseSelectActivity.kt  | 24 +++++--------------
 .../metadata/android/en-US/changelogs/149.txt |  2 +-
 .../metadata/android/fr-FR/changelogs/149.txt |  2 +-
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e90effacc..cc2e2764c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
 KeePassDX(4.2.4)
- *
+ * Fix remembering database location #2262
 
 KeePassDX(4.2.3)
  * Fix multiple Passkey selection #2253
diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
index ba0a57bc0..a30aa0abb 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/FileDatabaseSelectActivity.kt
@@ -55,10 +55,8 @@ import com.kunzisoft.keepass.education.FileDatabaseSelectActivityEducation
 import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.model.RegisterInfo
 import com.kunzisoft.keepass.model.SearchInfo
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_CREATE_TASK
 import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.DATABASE_URI_KEY
 import com.kunzisoft.keepass.settings.PreferencesUtil
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.utils.AppUtil.isContributingUser
@@ -216,6 +214,12 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
             // Retrieve settings for default database
             mAdapterDatabaseHistory?.setDefaultDatabase(it)
         }
+
+        // Remove all the remember locations if needed
+        if (PreferencesUtil.rememberDatabaseLocations(applicationContext).not()) {
+            FileDatabaseHistoryAction.getInstance(applicationContext)
+                .deleteAll()
+        }
     }
 
     override fun onDatabaseRetrieved(database: ContextualDatabase) {
@@ -228,22 +232,6 @@ class FileDatabaseSelectActivity : DatabaseModeActivity(),
         result: ActionRunnable.Result
     ) {
         if (result.isSuccess) {
-            // Update list
-            when (actionTask) {
-                ACTION_DATABASE_CREATE_TASK,
-                ACTION_DATABASE_LOAD_TASK -> {
-                    result.data?.getParcelableCompat<Uri>(DATABASE_URI_KEY)?.let { databaseUri ->
-                        val mainCredential =
-                            result.data?.getParcelableCompat(DatabaseTaskNotificationService.MAIN_CREDENTIAL_KEY)
-                                ?: MainCredential()
-                        databaseFilesViewModel.addDatabaseFile(
-                            databaseUri,
-                            mainCredential.keyFileUri,
-                            mainCredential.hardwareKey
-                        )
-                    }
-                }
-            }
             // Launch activity
             when (actionTask) {
                 ACTION_DATABASE_CREATE_TASK -> {
diff --git a/fastlane/metadata/android/en-US/changelogs/149.txt b/fastlane/metadata/android/en-US/changelogs/149.txt
index 42780ecb1..113d10e58 100644
--- a/fastlane/metadata/android/en-US/changelogs/149.txt
+++ b/fastlane/metadata/android/en-US/changelogs/149.txt
@@ -1 +1 @@
- *
\ No newline at end of file
+ * Fix remembering database location #2262
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/149.txt b/fastlane/metadata/android/fr-FR/changelogs/149.txt
index 42780ecb1..927a506d8 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/149.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/149.txt
@@ -1 +1 @@
- *
\ No newline at end of file
+ * Correction de la sauvegarde de l'emplacement des bases de données #2262
\ No newline at end of file