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

Move database open to async task

Browse Source 
* Wrap key transformation in AsyncTask when reading a database. Significantly reduces user interface lockup.
* Replace root group with new group instead of deleting the pointer (fulfills member validity promise).
This commit is contained in:
Jonathan White
2020-03-04 10:05:33 -05:00
parent 91c6e436b3
commit a8c02fdc3c
4 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/Database.cpp
View File

@@ -415,27 +415,26 @@ void Database::releaseData()
// Prevent data release while saving
QMutexLocker locker(&m_saveMutex);
s_uuidMap.remove(m_uuid);
m_uuid = QUuid();
if (m_modified) {
emit databaseDiscarded();
}
setEmitModified(false);
m_modified = false;
m_modifiedTimer.stop();
s_uuidMap.remove(m_uuid);
m_uuid = QUuid();
m_data.clear();
m_metadata->clear();
if (m_rootGroup && m_rootGroup->parent() == this) {
delete m_rootGroup;
}
setRootGroup(new Group());
m_fileWatcher->stop();
m_deletedObjects.clear();
m_commonUsernames.clear();
m_modified = false;
m_modifiedTimer.stop();
}
/**

9
src/core/Group.cpp
View File

@@ -967,14 +967,7 @@ void Group::removeEntry(Entry* entry)
void Group::connectDatabaseSignalsRecursive(Database* db)
{
if (m_db) {
disconnect(SIGNAL(groupDataChanged(Group*)), m_db);
disconnect(SIGNAL(groupAboutToRemove(Group*)), m_db);
disconnect(SIGNAL(groupRemoved()), m_db);
disconnect(SIGNAL(groupAboutToAdd(Group*, int)), m_db);
disconnect(SIGNAL(groupAdded()), m_db);
disconnect(SIGNAL(aboutToMove(Group*, Group*, int)), m_db);
disconnect(SIGNAL(groupMoved()), m_db);
disconnect(SIGNAL(groupModified()), m_db);
disconnect(m_db);
}
for (Entry* entry : asConst(m_entries)) {