File tree Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -506,25 +506,28 @@ void FeedlyNetwork::setBatchSize(int batch_size) {
506
506
void FeedlyNetwork::onTokensError (const QString& error, const QString& error_description) {
507
507
Q_UNUSED (error)
508
508
509
- qApp->showGuiMessage (Notification::Event::GeneralEvent ,
509
+ qApp->showGuiMessage (Notification::Event::LoginFailure ,
510
510
tr (" Feedly: authentication error" ),
511
511
tr (" Click this to login again. Error is: '%1'" ).arg (error_description),
512
512
QSystemTrayIcon::MessageIcon::Critical,
513
513
{}, {},
514
514
[this ]() {
515
- m_oauth->logout (false );
515
+ m_oauth->setAccessToken (QString ());
516
+ m_oauth->setRefreshToken (QString ());
517
+
518
+ // m_oauth->logout(false);
516
519
m_oauth->login ();
517
520
});
518
521
}
519
522
520
523
void FeedlyNetwork::onAuthFailed () {
521
- qApp->showGuiMessage (Notification::Event::GeneralEvent ,
524
+ qApp->showGuiMessage (Notification::Event::LoginFailure ,
522
525
tr (" Feedly: authorization denied" ),
523
526
tr (" Click this to login again." ),
524
527
QSystemTrayIcon::MessageIcon::Critical,
525
528
{}, {},
526
529
[this ]() {
527
- m_oauth->logout (false );
530
+ // m_oauth->logout(false);
528
531
m_oauth->login ();
529
532
});
530
533
}
Original file line number Diff line number Diff line change @@ -420,7 +420,7 @@ QVariantHash GmailNetworkFactory::getProfile(const QNetworkProxy& custom_proxy)
420
420
void GmailNetworkFactory::onTokensError (const QString& error, const QString& error_description) {
421
421
Q_UNUSED (error)
422
422
423
- qApp->showGuiMessage (Notification::Event::GeneralEvent ,
423
+ qApp->showGuiMessage (Notification::Event::LoginFailure ,
424
424
tr (" Gmail: authentication error" ),
425
425
tr (" Click this to login again. Error is: '%1'" ).arg (error_description),
426
426
QSystemTrayIcon::MessageIcon::Critical,
Original file line number Diff line number Diff line change @@ -1081,7 +1081,7 @@ QString GreaderNetwork::generateFullUrl(GreaderNetwork::Operations operation) co
1081
1081
void GreaderNetwork::onTokensError (const QString& error, const QString& error_description) {
1082
1082
Q_UNUSED (error)
1083
1083
1084
- qApp->showGuiMessage (Notification::Event::GeneralEvent ,
1084
+ qApp->showGuiMessage (Notification::Event::LoginFailure ,
1085
1085
tr (" Inoreader: authentication error" ),
1086
1086
tr (" Click this to login again. Error is: '%1'" ).arg (error_description),
1087
1087
QSystemTrayIcon::MessageIcon::Critical,
@@ -1106,8 +1106,8 @@ void GreaderNetwork::onAuthFailed() {
1106
1106
1107
1107
void GreaderNetwork::initializeOauth () {
1108
1108
#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));
1111
1111
#endif
1112
1112
1113
1113
m_oauth->setRedirectUrl (QString (OAUTH_REDIRECT_URI) +
You can’t perform that action at this time.
0 commit comments