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 object deletion

Browse Source
This commit is contained in:
J-Jamet
2022-01-17 22:07:32 +01:00
parent 3426b3cdeb
commit 2f2cbf343e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,11 +62,11 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
}
if (database.settingsChanged.date.before(databaseToMerge.settingsChanged.date)) {
database.color = databaseToMerge.color
database.compressionAlgorithm = databaseToMerge.compressionAlgorithm
database.historyMaxItems = databaseToMerge.historyMaxItems
database.historyMaxSize = databaseToMerge.historyMaxSize
database.encryptionAlgorithm = databaseToMerge.encryptionAlgorithm
database.kdfParameters = databaseToMerge.kdfParameters
database.compressionAlgorithm = databaseToMerge.compressionAlgorithm
database.numberKeyEncryptionRounds = databaseToMerge.numberKeyEncryptionRounds
database.memoryUsage = databaseToMerge.memoryUsage
database.parallelism = databaseToMerge.parallelism
@@ -207,10 +207,10 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
if (entry == null) {
// If it's a deleted object, but another instance was updated
// If entry parent to add exists and in current database
if (deletedObject == null
if ((deletedObject == null
|| deletedObject.deletionTime.date
.before(entryToMerge.lastModificationTime.date)
|| parentEntryToMerge != null) {
.before(entryToMerge.lastModificationTime.date))
&& parentEntryToMerge != null) {
database.addEntryTo(entryToMerge, parentEntryToMerge)
}
} else if (entry.lastModificationTime.date
@@ -275,10 +275,10 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
if (group == null) {
// If group parent to add exists and in current database
if (deletedObject == null
if ((deletedObject == null
|| deletedObject.deletionTime.date
.before(groupToMerge.lastModificationTime.date)
|| parentGroupToMerge != null) {
.before(groupToMerge.lastModificationTime.date))
&& parentGroupToMerge != null) {
database.addGroupTo(groupToMerge, parentGroupToMerge)
}
} else if (group.lastModificationTime.date