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: lastmodificationTime equals #2223

Browse Source
This commit is contained in:
J-Jamet
2025-10-24 12:47:11 +02:00
parent a76b1195e5
commit d6dc75961b
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
database/src/main/java/com/kunzisoft/keepass/database/element/DateInstant.kt
View File

@@ -224,6 +224,10 @@ class DateInstant : Parcelable {
return this.mInstant.isAfter(dateInstant.mInstant) return this.mInstant.isAfter(dateInstant.mInstant)
} }
fun isEquals(dateInstant: DateInstant): Boolean {
return this.mInstant.isEqual(dateInstant.mInstant)
}
fun compareTo(other: DateInstant): Int { fun compareTo(other: DateInstant): Int {
return mInstant.compareTo(other.mInstant) return mInstant.compareTo(other.mInstant)
} }

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

@@ -34,6 +34,7 @@ import com.kunzisoft.keepass.database.element.node.NodeId
import com.kunzisoft.keepass.database.element.node.NodeIdInt import com.kunzisoft.keepass.database.element.node.NodeIdInt
import com.kunzisoft.keepass.database.element.node.NodeIdUUID import com.kunzisoft.keepass.database.element.node.NodeIdUUID
import com.kunzisoft.keepass.database.element.node.NodeVersioned import com.kunzisoft.keepass.database.element.node.NodeVersioned
import com.kunzisoft.keepass.database.exception.DuplicateUuidDatabaseException
import com.kunzisoft.keepass.utils.readAllBytes import com.kunzisoft.keepass.utils.readAllBytes
import java.io.IOException import java.io.IOException
import java.util.UUID import java.util.UUID
@@ -486,8 +487,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
// Merge independently custom data // Merge independently custom data
mergeCustomData(entry.customData, entryToMerge.customData) mergeCustomData(entry.customData, entryToMerge.customData)
// Merge by modification time // Merge by modification time
if (entry.lastModificationTime.isBefore(entryToMerge.lastModificationTime) if (entry.lastModificationTime.isBefore(entryToMerge.lastModificationTime)) {
) {
// Update entry with databaseEntryToMerge and merge history // Update entry with databaseEntryToMerge and merge history
addHistory(entry, entryToMerge) addHistory(entry, entryToMerge)
if (parentEntryToMerge == entry.parent) { if (parentEntryToMerge == entry.parent) {
@@ -498,10 +498,9 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
database.addEntryTo(entryToMerge, parentEntryToMerge) database.addEntryTo(entryToMerge, parentEntryToMerge)
} }
} }
} else if (entry.lastModificationTime.isAfter(entryToMerge.lastModificationTime) } else if (entry.lastModificationTime.isAfter(entryToMerge.lastModificationTime)) {
) {
addHistory(entryToMerge, entry) addHistory(entryToMerge, entry)
} else { } else if (entry.lastModificationTime.isEquals(entryToMerge.lastModificationTime)) {
// If it's the same modification time, simply move entry to the right location // If it's the same modification time, simply move entry to the right location
parentEntryToMerge?.let { parentEntryToMerge?.let {
database.removeEntryFrom(entry, entry.parent) database.removeEntryFrom(entry, entry.parent)
@@ -567,8 +566,7 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
// Merge independently custom data // Merge independently custom data
mergeCustomData(group.customData, groupToMerge.customData) mergeCustomData(group.customData, groupToMerge.customData)
// Merge by modification time // Merge by modification time
if (group.lastModificationTime.isBefore(groupToMerge.lastModificationTime) if (group.lastModificationTime.isBefore(groupToMerge.lastModificationTime)) {
) {
if (parentGroupToMerge == group.parent) { if (parentGroupToMerge == group.parent) {
group.updateWith(groupToMerge, false) group.updateWith(groupToMerge, false)
} else { } else {
@@ -577,6 +575,12 @@ class DatabaseKDBXMerger(private var database: DatabaseKDBX) {
database.addGroupTo(groupToMerge, parentGroupToMerge) database.addGroupTo(groupToMerge, parentGroupToMerge)
} }
} }
} else if (group.lastModificationTime.isEquals(groupToMerge.lastModificationTime)) {
// If it's the same modification time, simply move group to the right location
parentGroupToMerge?.let {
database.removeGroupFrom(group, group.parent)
database.addGroupTo(groupToMerge, parentGroupToMerge)
}
} }
} }
} }