From a48dccf27ac50d6bcf82c18521644ff436c84072 Mon Sep 17 00:00:00 2001
From: J-Jamet <jeremy.jamet@kunzisoft.com>
Date: Tue, 21 Oct 2025 12:36:23 +0200
Subject: [PATCH] fix: Entries missing after database merge #2223

---
 .../keepass/database/merge/DatabaseKDBXMerger.kt         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/database/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt b/database/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt
index 19e18b9e6..82cd30480 100644
--- a/database/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt
+++ b/database/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt
@@ -488,11 +488,11 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
                 // Merge by modification time
                 if (entry.lastModificationTime.isBefore(entryToMerge.lastModificationTime)
                 ) {
+                    // Update entry with databaseEntryToMerge and merge history
                     addHistory(entry, entryToMerge)
                     if (parentEntryToMerge == entry.parent) {
                         entry.updateWith(entryToMerge, copyHistory = true, updateParents = false)
                     } else {
-                        // Update entry with databaseEntryToMerge and merge history
                         database.removeEntryFrom(entry, entry.parent)
                         if (parentEntryToMerge != null) {
                             database.addEntryTo(entryToMerge, parentEntryToMerge)
@@ -501,6 +501,12 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
                 } else if (entry.lastModificationTime.isAfter(entryToMerge.lastModificationTime)
                 ) {
                     addHistory(entryToMerge, entry)
+                } else {
+                    // If it's the same modification time, simply move entry to the right location
+                    parentEntryToMerge?.let {
+                        database.removeEntryFrom(entry, entry.parent)
+                        database.addEntryTo(entryToMerge, parentEntryToMerge)
+                    }
                 }
             }
         }
@@ -569,6 +575,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
                         database.removeGroupFrom(group, group.parent)
                         if (parentGroupToMerge != null) {
                             database.addGroupTo(groupToMerge, parentGroupToMerge)
+                            // Add each child
                         }
                     }
                 }