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

Remove unused code

Browse Source
This commit is contained in:
J-Jamet
2022-02-12 12:38:44 +01:00
parent 45937f9c9c
commit cea7f1c2d1
1 changed files with 2 additions and 6 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

@@ -115,9 +115,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
this.notes = srcEntryToMerge.notes
// TODO attachment
}
if (entry != null) {
entry.updateWith(entryToMerge, false)
} else if (parentEntryToMerge != null) {
if (entry == null && parentEntryToMerge != null) {
database.addEntryTo(entryToMerge, parentEntryToMerge)
}
}
@@ -148,9 +146,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
this.expires = srcGroupToMerge.expires
this.title = srcGroupToMerge.title
}
if (group != null) {
// Normally not append
} else if (parentGroupToMerge != null) {
if (group == null && parentGroupToMerge != null) {
database.addGroupTo(groupToMerge, parentGroupToMerge)
}
}