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

Improve handling of closed keychain

Browse Source
This commit is contained in:
Tobias Fella
2021-11-13 14:57:24 +01:00
parent 8aa710d50f
commit 0a19d42799
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
qml/main.qml
View File

@@ -335,7 +335,7 @@ Kirigami.ApplicationWindow {
} }
function onGlobalErrorOccured(error, detail) { function onGlobalErrorOccured(error, detail) {
showPassiveNotification(i18nc("%1: %2", error, detail)); showPassiveNotification(i18n("%1: %2", error, detail));
} }
function onShowWindow() { function onShowWindow() {

33
src/controller.cpp
View File

@@ -311,23 +311,30 @@ QByteArray Controller::loadAccessTokenFromFile(const AccountSettings &account)
QByteArray Controller::loadAccessTokenFromKeyChain(const AccountSettings &account) QByteArray Controller::loadAccessTokenFromKeyChain(const AccountSettings &account)
{ {
qDebug() << "Read the access token from the keychain for " << account.userId(); QKeychain::Error error;
QKeychain::ReadPasswordJob job(qAppName()); QString errorString;
job.setAutoDelete(false); do {
job.setKey(account.userId()); qDebug() << "Reading access token from the keychain for" << account.userId();
QEventLoop loop; QKeychain::ReadPasswordJob job(qAppName());
QKeychain::ReadPasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit); job.setAutoDelete(false);
job.start(); job.setKey(account.userId());
loop.exec(); QEventLoop loop;
QKeychain::ReadPasswordJob::connect(&job, &QKeychain::Job::finished, &loop, &QEventLoop::quit);
job.start();
loop.exec();
if (job.error() == QKeychain::Error::NoError) { if (job.error() == QKeychain::Error::NoError) {
return job.binaryData(); return job.binaryData();
} }
Q_EMIT globalErrorOccured(i18n("Unable to read access token"), i18n("Please make sure that the keychain is opened."));
error = job.error();
errorString = job.errorString();
} while (error == QKeychain::Error::OtherError);
qWarning() << "Could not read the access token from the keychain: " << qPrintable(job.errorString()); qWarning() << "Could not read the access token from the keychain:" << errorString;
// 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 (job.error() == QKeychain::Error::EntryNotFound) { if (error == QKeychain::Error::EntryNotFound) {
if (!accessToken.isEmpty()) { if (!accessToken.isEmpty()) {
qDebug() << "Migrating the access token from file to the keychain for " << account.userId(); qDebug() << "Migrating the access token from file to the keychain for " << account.userId();
bool removed = false; bool removed = false;