Skip to content

Commit be05100

Browse files
author
Martin Rotter
committed
fix build
1 parent b1e4562 commit be05100

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/librssguard/services/feedly/feedlynetwork.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -506,25 +506,28 @@ void FeedlyNetwork::setBatchSize(int batch_size) {
506506
void FeedlyNetwork::onTokensError(const QString& error, const QString& error_description) {
507507
Q_UNUSED(error)
508508

509-
qApp->showGuiMessage(Notification::Event::GeneralEvent,
509+
qApp->showGuiMessage(Notification::Event::LoginFailure,
510510
tr("Feedly: authentication error"),
511511
tr("Click this to login again. Error is: '%1'").arg(error_description),
512512
QSystemTrayIcon::MessageIcon::Critical,
513513
{}, {},
514514
[this]() {
515-
m_oauth->logout(false);
515+
m_oauth->setAccessToken(QString());
516+
m_oauth->setRefreshToken(QString());
517+
518+
//m_oauth->logout(false);
516519
m_oauth->login();
517520
});
518521
}
519522

520523
void FeedlyNetwork::onAuthFailed() {
521-
qApp->showGuiMessage(Notification::Event::GeneralEvent,
524+
qApp->showGuiMessage(Notification::Event::LoginFailure,
522525
tr("Feedly: authorization denied"),
523526
tr("Click this to login again."),
524527
QSystemTrayIcon::MessageIcon::Critical,
525528
{}, {},
526529
[this]() {
527-
m_oauth->logout(false);
530+
//m_oauth->logout(false);
528531
m_oauth->login();
529532
});
530533
}

src/librssguard/services/gmail/gmailnetworkfactory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ QVariantHash GmailNetworkFactory::getProfile(const QNetworkProxy& custom_proxy)
420420
void GmailNetworkFactory::onTokensError(const QString& error, const QString& error_description) {
421421
Q_UNUSED(error)
422422

423-
qApp->showGuiMessage(Notification::Event::GeneralEvent,
423+
qApp->showGuiMessage(Notification::Event::LoginFailure,
424424
tr("Gmail: authentication error"),
425425
tr("Click this to login again. Error is: '%1'").arg(error_description),
426426
QSystemTrayIcon::MessageIcon::Critical,

src/librssguard/services/greader/greadernetwork.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ QString GreaderNetwork::generateFullUrl(GreaderNetwork::Operations operation) co
10811081
void GreaderNetwork::onTokensError(const QString& error, const QString& error_description) {
10821082
Q_UNUSED(error)
10831083

1084-
qApp->showGuiMessage(Notification::Event::GeneralEvent,
1084+
qApp->showGuiMessage(Notification::Event::LoginFailure,
10851085
tr("Inoreader: authentication error"),
10861086
tr("Click this to login again. Error is: '%1'").arg(error_description),
10871087
QSystemTrayIcon::MessageIcon::Critical,
@@ -1106,8 +1106,8 @@ void GreaderNetwork::onAuthFailed() {
11061106

11071107
void GreaderNetwork::initializeOauth() {
11081108
#if defined(INOREADER_OFFICIAL_SUPPORT)
1109-
m_oauth2->setClientSecretId(TextFactory::decrypt(INOREADER_CLIENT_ID, OAUTH_DECRYPTION_KEY));
1110-
m_oauth2->setClientSecretSecret(TextFactory::decrypt(INOREADER_CLIENT_SECRET, OAUTH_DECRYPTION_KEY));
1109+
m_oauth->setClientSecretId(TextFactory::decrypt(INOREADER_CLIENT_ID, OAUTH_DECRYPTION_KEY));
1110+
m_oauth->setClientSecretSecret(TextFactory::decrypt(INOREADER_CLIENT_SECRET, OAUTH_DECRYPTION_KEY));
11111111
#endif
11121112

11131113
m_oauth->setRedirectUrl(QString(OAUTH_REDIRECT_URI) +

0 commit comments

Comments
 (0)