mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source 
# Conflicts:
#	src/core/Group.cpp
This commit is contained in:
Jonathan White 2017-10-01 11:10:10 -04:00
commit 14e3d9d576
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
56 changed files with 13872 additions and 6723 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/core/Group.cpp
View file

@ -668,7 +668,7 @@ void Group::merge(const Group* other)
// This entry does not exist at all. Create it.
if (!existingEntry) {
qDebug("New entry %s detected. Creating it.", qPrintable(entry->title()));
entry->clone(Entry::CloneNoFlags)->setGroup(this);
entry->clone(Entry::CloneIncludeHistory)->setGroup(this);
// Entry is already present in the database. Update it.
} else {
bool locationChanged = existingEntry->timeInfo().locationChanged() < entry->timeInfo().locationChanged();
@ -902,11 +902,11 @@ void Group::resolveConflict(Entry* existingEntry, Entry* otherEntry)
case KeepBoth:
// if one entry is newer, create a clone and add it to the group
if (timeExisting > timeOther) {
clonedEntry = otherEntry->clone(Entry::CloneNewUuid);
clonedEntry = otherEntry->clone(Entry::CloneNewUuid | Entry::CloneIncludeHistory);
clonedEntry->setGroup(this);
markOlderEntry(clonedEntry);
} else if (timeExisting < timeOther) {
clonedEntry = otherEntry->clone(Entry::CloneNewUuid);
clonedEntry = otherEntry->clone(Entry::CloneNewUuid | Entry::CloneIncludeHistory);
clonedEntry->setGroup(this);
markOlderEntry(existingEntry);
}
@ -917,7 +917,7 @@ void Group::resolveConflict(Entry* existingEntry, Entry* otherEntry)
// only if other entry is newer, replace existing one
Group* currentGroup = existingEntry->group();
currentGroup->removeEntry(existingEntry);
otherEntry->clone(Entry::CloneNoFlags)->setGroup(currentGroup);
otherEntry->clone(Entry::CloneIncludeHistory)->setGroup(currentGroup);
}
break;