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

Add extend entry-size calculation (resolved #1387)

Browse source 
Extended the calculation for the size of history items to match KeePass2
Small refactoring regarding readability in EntryAttachements
This commit is contained in:
Christian Kieschnick 2018-01-15 17:20:16 +01:00 • committed by Janek Bevendorff
parent 83f1a53d32
commit 045f157a63
No known key found for this signature in database
GPG key ID: 2FDEB0D40BCA5E11
7 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/core/Entry.cpp
View file

@ -582,7 +582,7 @@ void Entry::truncateHistory()
int histMaxSize = db->metadata()->historyMaxSize();
if (histMaxSize > -1) {
int size = 0;
QSet<QByteArray> foundAttachments = attachments()->values().toSet();
QSet<QByteArray> foundAttachments = attachments()->values();
QMutableListIterator<Entry*> i(m_history);
i.toBack();
@ -592,12 +592,12 @@ void Entry::truncateHistory()
// don't calculate size if it's already above the maximum
if (size <= histMaxSize) {
size += historyItem->attributes()->attributesSize();
const QSet<QByteArray> newAttachments = historyItem->attachments()->values().toSet() - foundAttachments;
for (const QByteArray& attachment : newAttachments) {
size += attachment.size();
size += historyItem->autoTypeAssociations()->associationsSize();
size += historyItem->attachments()->attachmentsSize(foundAttachments);
foreach( const QString &tag, historyItem->tags().split(QRegExp(",|;|:"), QString::SkipEmptyParts)){
size += tag.toUtf8().size();
}
foundAttachments += newAttachments;
foundAttachments += historyItem->attachments()->values();
}
if (size > histMaxSize) {