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

Fixed issues with initial commit

Browse source
This commit is contained in:
pasdam 2018-03-23 11:18:06 +01:00 • committed by Jonathan White
parent ad4423d226
commit b4d806ad41
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
17 changed files with 43 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/sshagent/SSHAgent.cpp
View file

@ -234,11 +234,11 @@ bool SSHAgent::removeIdentity(OpenSSHKey& key)
return true;
}
void SSHAgent::removeIdentityAtLock(const OpenSSHKey& key, const Uuid& uuid)
void SSHAgent::removeIdentityAtLock(const OpenSSHKey& key, const QUuid& uuid)
{
OpenSSHKey copy = key;
copy.clearPrivate();
m_keys[uuid.toHex()].insert(copy);
m_keys[uuid].insert(copy);
}
void SSHAgent::databaseModeChanged(DatabaseWidget::Mode mode)
@ -249,17 +249,17 @@ void SSHAgent::databaseModeChanged(DatabaseWidget::Mode mode)
return;
}
Uuid uuid = widget->database()->uuid();
const QUuid& uuid = widget->database()->uuid();
if (mode == DatabaseWidget::LockedMode && m_keys.contains(uuid.toHex())) {
if (mode == DatabaseWidget::LockedMode && m_keys.contains(uuid)) {
QSet<OpenSSHKey> keys = m_keys.take(uuid.toHex());
QSet<OpenSSHKey> keys = m_keys.take(uuid);
for (OpenSSHKey key : keys) {
if (!removeIdentity(key)) {
emit error(m_error);
}
}
} else if (mode == DatabaseWidget::ViewMode && !m_keys.contains(uuid.toHex())) {
} else if (mode == DatabaseWidget::ViewMode && !m_keys.contains(uuid)) {
for (Entry* e : widget->database()->rootGroup()->entriesRecursive()) {
if (widget->database()->metadata()->recycleBinEnabled()