From cedf2eafbbf98c41a06b18dfb43c8397f3e4dbba Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sat, 12 Feb 2022 12:57:57 +0100 Subject: [PATCH] Revert "Remove unused code" This reverts commit cea7f1c2d15e65e82d0a3a00c78fc3740bb78758. --- .../keepass/database/merge/DatabaseKDBXMerger.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt b/app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt index 2870bcc08..db1c0cc9e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt +++ b/app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt @@ -138,7 +138,9 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) { this.putAttachment(it, database.attachmentPool) } } - if (entry == null && parentEntryToMerge != null) { + if (entry != null) { + entry.updateWith(entryToMerge, false) + } else if (parentEntryToMerge != null) { database.addEntryTo(entryToMerge, parentEntryToMerge) } } @@ -169,7 +171,9 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) { this.expires = srcGroupToMerge.expires this.title = srcGroupToMerge.title } - if (group == null && parentGroupToMerge != null) { + if (group != null) { + // Normally not append + } else if (parentGroupToMerge != null) { database.addGroupTo(groupToMerge, parentGroupToMerge) } }