ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't connect to something that isn't a signal

Browse Source
This commit is contained in:
Tobias Fella
2021-12-14 23:26:28 +01:00
committed by Carl Schwan
parent 599ab11656
commit 91f3f64bb5
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/controller.cpp
View File

@@ -333,8 +333,11 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
job->setKey(account.userId()); job->setKey(account.userId());
// Handling of errors // Handling of errors
connect(job, &QKeychain::Job::emitFinishedWithError, this, [this, &account, job](QKeychain::Error error, const QString &errorString) { connect(job, &QKeychain::Job::finished, this, [this, &account, job]() {
if (error == QKeychain::Error::EntryNotFound) { if (job->error() == QKeychain::Error::NoError) {
return;
}
if (job->error() == QKeychain::Error::EntryNotFound) {
// no access token from the keychain, try token file // no access token from the keychain, try token file
auto accessToken = loadAccessTokenFromFile(account); auto accessToken = loadAccessTokenFromFile(account);
if (!accessToken.isEmpty()) { if (!accessToken.isEmpty()) {
@@ -353,7 +356,7 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
} }
} }
switch (error) { switch (job->error()) {
case QKeychain::EntryNotFound: case QKeychain::EntryNotFound:
Q_EMIT globalErrorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?")); Q_EMIT globalErrorOccured(i18n("Access token wasn't found"), i18n("Maybe it was deleted?"));
break; break;
@@ -365,7 +368,7 @@ QKeychain::ReadPasswordJob *Controller::loadAccessTokenFromKeyChain(const Accoun
Q_EMIT globalErrorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux")); Q_EMIT globalErrorOccured(i18n("No keychain available."), i18n("Please install a keychain, e.g. KWallet or GNOME keyring on Linux"));
break; break;
case QKeychain::OtherError: case QKeychain::OtherError:
Q_EMIT globalErrorOccured(i18n("Unable to read access token"), errorString); Q_EMIT globalErrorOccured(i18n("Unable to read access token"), job->errorString());
break; break;
default: default:
break; break;