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

Support returning a canceled message

Browse source
This commit is contained in:
varjolintu 2019-06-13 10:05:29 +03:00 • committed by Jonathan White
parent b4dab5d8b1
commit 3cf171cbf5
4 changed files with 49 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/browser/BrowserService.cpp
View file

@ -450,7 +450,7 @@ void BrowserService::addEntry(const QString& id,
auto db = selectedDb ? selectedDb : selectedDatabase();
if (!db) {
return;
return;
}
auto* entry = new Entry();
@ -489,17 +489,20 @@ void BrowserService::addEntry(const QString& id,
config.save(entry);
}
void BrowserService::updateEntry(const QString& id,
const QString& uuid,
const QString& login,
const QString& password,
const QString& url,
const QString& submitUrl)
BrowserService::ReturnValue
BrowserService::updateEntry(const QString& id,
const QString& uuid,
const QString& login,
const QString& password,
const QString& url,
const QString& submitUrl)
{
ReturnValue result = ReturnValue::Error;
if (thread() != QThread::currentThread()) {
QMetaObject::invokeMethod(this,
"updateEntry",
Qt::BlockingQueuedConnection,
Q_RETURN_ARG(ReturnValue, result),
Q_ARG(QString, id),
Q_ARG(QString, uuid),
Q_ARG(QString, login),
@ -510,14 +513,14 @@ void BrowserService::updateEntry(const QString& id,
auto db = selectedDatabase();
if (!db) {
return;
return ReturnValue::Error;
}
Entry* entry = db->rootGroup()->findEntryByUuid(Tools::hexToUuid(uuid));
if (!entry) {
// If entry is not found for update, add a new one to the selected database
addEntry(id, login, password, url, submitUrl, "", "", "", db);
return;
return ReturnValue::Success;
}
// Check if the entry password is a reference. If so, update the original entry instead
@ -526,14 +529,14 @@ void BrowserService::updateEntry(const QString& id,
if (!referenceUuid.isNull()) {
entry = db->rootGroup()->findEntryByUuid(referenceUuid);
if (!entry) {
return;
return ReturnValue::Error;
}
}
}
QString username = entry->username();
if (username.isEmpty()) {
return;
return ReturnValue::Error;
}
if (username.compare(login, Qt::CaseSensitive) != 0
@ -557,10 +560,15 @@ void BrowserService::updateEntry(const QString& id,
}
entry->setPassword(password);
entry->endUpdate();
result = ReturnValue::Success;
} else {
result = ReturnValue::Canceled;
}
hideWindow();
}
return result;
}
QList<Entry*>