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

Do not import meta stream entries

Browse Source
This commit is contained in:
J-Jamet
2022-02-12 12:37:49 +01:00
parent ee2a1ea924
commit 45937f9c9c
1 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,31 +92,34 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
val entry = database.getEntryById(entryId) val entry = database.getEntryById(entryId)
databaseToMerge.getEntryById(entryId)?.let { srcEntryToMerge -> databaseToMerge.getEntryById(entryId)?.let { srcEntryToMerge ->
// Retrieve parent in current database // Do not merge meta stream elements
var parentEntryToMerge: GroupKDBX? = null if (!srcEntryToMerge.isMetaStream()) {
srcEntryToMerge.parent?.nodeId?.let { // Retrieve parent in current database
val parentGroupIdToMerge = getNodeIdUUIDFrom(seed, it) var parentEntryToMerge: GroupKDBX? = null
parentEntryToMerge = database.getGroupById(parentGroupIdToMerge) srcEntryToMerge.parent?.nodeId?.let {
} val parentGroupIdToMerge = getNodeIdUUIDFrom(seed, it)
val entryToMerge = EntryKDBX().apply { parentEntryToMerge = database.getGroupById(parentGroupIdToMerge)
this.nodeId = srcEntryToMerge.nodeId }
this.icon = srcEntryToMerge.icon val entryToMerge = EntryKDBX().apply {
this.creationTime = DateInstant(srcEntryToMerge.creationTime) this.nodeId = srcEntryToMerge.nodeId
this.lastModificationTime = DateInstant(srcEntryToMerge.lastModificationTime) this.icon = srcEntryToMerge.icon
this.lastAccessTime = DateInstant(srcEntryToMerge.lastAccessTime) this.creationTime = DateInstant(srcEntryToMerge.creationTime)
this.expiryTime = DateInstant(srcEntryToMerge.expiryTime) this.lastModificationTime = DateInstant(srcEntryToMerge.lastModificationTime)
this.expires = srcEntryToMerge.expires this.lastAccessTime = DateInstant(srcEntryToMerge.lastAccessTime)
this.title = srcEntryToMerge.title this.expiryTime = DateInstant(srcEntryToMerge.expiryTime)
this.username = srcEntryToMerge.username this.expires = srcEntryToMerge.expires
this.password = srcEntryToMerge.password this.title = srcEntryToMerge.title
this.url = srcEntryToMerge.url this.username = srcEntryToMerge.username
this.notes = srcEntryToMerge.notes this.password = srcEntryToMerge.password
// TODO attachment this.url = srcEntryToMerge.url
} this.notes = srcEntryToMerge.notes
if (entry != null) { // TODO attachment
entry.updateWith(entryToMerge, false) }
} else if (parentEntryToMerge != null) { if (entry != null) {
database.addEntryTo(entryToMerge, parentEntryToMerge) entry.updateWith(entryToMerge, false)
} else if (parentEntryToMerge != null) {
database.addEntryTo(entryToMerge, parentEntryToMerge)
}
} }
} }
} }