jacobpascual/keepassxc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix entry clone modification time update (#3602)

Browse Source 
* Add test for (unwanted) history timeinfo update when cloning entries.
* Add timeInfo test for clone with rename.
* Fixed modification time update when cloning an entry with renaming.
This commit is contained in:
libklein
2019-10-05 19:58:00 +02:00
committed by Jonathan White
parent 1ceacdf636
commit 058b4da954
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/Entry.cpp
View File

@@ -762,14 +762,13 @@ Entry* Entry::clone(CloneFlags flags) const
entry->m_autoTypeAssociations->copyDataFrom(m_autoTypeAssociations);
if (flags & CloneIncludeHistory) {
for (Entry* historyItem : m_history) {
Entry* historyItemClone = historyItem->clone(flags & ~CloneIncludeHistory & ~CloneNewUuid);
Entry* historyItemClone = historyItem->clone(flags & ~CloneIncludeHistory & ~CloneNewUuid & ~CloneResetTimeInfo);
historyItemClone->setUpdateTimeinfo(false);
historyItemClone->setUuid(entry->uuid());
historyItemClone->setUpdateTimeinfo(true);
entry->addHistoryItem(historyItemClone);
}
}
entry->setUpdateTimeinfo(true);
if (flags & CloneResetTimeInfo) {
QDateTime now = Clock::currentDateTimeUtc();
@@ -782,6 +781,8 @@ Entry* Entry::clone(CloneFlags flags) const
if (flags & CloneRenameTitle)
entry->setTitle(tr("%1 - Clone").arg(entry->title()));
entry->setUpdateTimeinfo(true);
return entry;
}