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

Merge entry history

Browse Source
This commit is contained in:
J-Jamet
2022-01-15 21:37:24 +01:00
parent f9445de71f
commit ead59bd410
1 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,16 +141,44 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
} else if (entry.lastModificationTime.date
.before(entryToMerge.lastModificationTime.date)
) {
// Keep entry as history if already not present
entry.history.forEach { history ->
// If history not present
if (!entryToMerge.history.any {
it.lastModificationTime == history.lastModificationTime
}) {
entryToMerge.addEntryToHistory(history)
}
}
// Last entry not present
val history = EntryKDBX().apply {
updateWith(entry, false)
parent = null
}
entryToMerge.addEntryToHistory(history)
if (parentEntryToMerge == entry.parent) {
entry.updateWith(entryToMerge)
} else {
// Update entry with databaseEntryToMerge and merge history
database.removeEntryFrom(entry, entry.parent)
// TODO history =
if (parentEntryToMerge != null) {
database.addEntryTo(entryToMerge, parentEntryToMerge)
}
}
} else {
entryToMerge.history.forEach { history ->
if (!entry.history.any {
it.lastModificationTime == history.lastModificationTime
}) {
entry.addEntryToHistory(history)
}
}
// Keep entry to merge as history
val history = EntryKDBX().apply {
updateWith(entryToMerge, false)
parent = null
}
entry.addEntryToHistory(history)
}
}
}