rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove unused code"

Browse Source 
This reverts commit cea7f1c2d1.
This commit is contained in:
J-Jamet
2022-02-12 12:57:57 +01:00
parent e7553c68a0
commit cedf2eafbb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/kunzisoft/keepass/database/merge/DatabaseKDBXMerger.kt
View File

@@ -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)
}
}