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

Fix index for duplicate UUID

Browse Source
This commit is contained in:
J-Jamet
2019-10-01 14:15:11 +02:00
parent 891036c35c
commit a1d2022492
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/kunzisoft/keepass/database/element/PwDatabase.kt
View File

@@ -245,8 +245,10 @@ abstract class PwDatabase<
val groupId = group.nodeId
if (groupIndexes.containsKey(groupId)) {
if (changeDuplicateId) {
group.nodeId = newGroupId()
this.groupIndexes[groupId] = group
val newGroupId = newGroupId()
group.nodeId = newGroupId
group.parent?.addChildGroup(group)
this.groupIndexes[newGroupId] = group
} else {
throw LoadDatabaseDuplicateUuidException(Type.GROUP, groupId)
}
@@ -285,8 +287,10 @@ abstract class PwDatabase<
val entryId = entry.nodeId
if (entryIndexes.containsKey(entryId)) {
if (changeDuplicateId) {
entry.nodeId = newEntryId()
this.entryIndexes[entryId] = entry
val newEntryId = newEntryId()
entry.nodeId = newEntryId
entry.parent?.addChildEntry(entry)
this.entryIndexes[newEntryId] = entry
} else {
throw LoadDatabaseDuplicateUuidException(Type.ENTRY, entryId)
}