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

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

@@ -92,6 +92,8 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
val entry = database.getEntryById(entryId)
databaseToMerge.getEntryById(entryId)?.let { srcEntryToMerge ->
// Do not merge meta stream elements
if (!srcEntryToMerge.isMetaStream()) {
// Retrieve parent in current database
var parentEntryToMerge: GroupKDBX? = null
srcEntryToMerge.parent?.nodeId?.let {
@@ -120,6 +122,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
}
}
}
}
/**
* Utility method to merge a KDB group