From be051000b58cd7876005778552c5fd289f0afe02 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Fri, 13 Aug 2021 11:39:34 +0200
Subject: [PATCH] fix build

---
 src/librssguard/services/feedly/feedlynetwork.cpp     | 11 +++++++----
 .../services/gmail/gmailnetworkfactory.cpp            |  2 +-
 src/librssguard/services/greader/greadernetwork.cpp   |  6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/librssguard/services/feedly/feedlynetwork.cpp b/src/librssguard/services/feedly/feedlynetwork.cpp
index c80428f25..49598f269 100755
--- a/src/librssguard/services/feedly/feedlynetwork.cpp
+++ b/src/librssguard/services/feedly/feedlynetwork.cpp
@@ -506,25 +506,28 @@ void FeedlyNetwork::setBatchSize(int batch_size) {
 void FeedlyNetwork::onTokensError(const QString& error, const QString& error_description) {
   Q_UNUSED(error)
 
-  qApp->showGuiMessage(Notification::Event::GeneralEvent,
+  qApp->showGuiMessage(Notification::Event::LoginFailure,
                        tr("Feedly: authentication error"),
                        tr("Click this to login again. Error is: '%1'").arg(error_description),
                        QSystemTrayIcon::MessageIcon::Critical,
                        {}, {},
                        [this]() {
-    m_oauth->logout(false);
+    m_oauth->setAccessToken(QString());
+    m_oauth->setRefreshToken(QString());
+
+    //m_oauth->logout(false);
     m_oauth->login();
   });
 }
 
 void FeedlyNetwork::onAuthFailed() {
-  qApp->showGuiMessage(Notification::Event::GeneralEvent,
+  qApp->showGuiMessage(Notification::Event::LoginFailure,
                        tr("Feedly: authorization denied"),
                        tr("Click this to login again."),
                        QSystemTrayIcon::MessageIcon::Critical,
                        {}, {},
                        [this]() {
-    m_oauth->logout(false);
+    //m_oauth->logout(false);
     m_oauth->login();
   });
 }
diff --git a/src/librssguard/services/gmail/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/gmailnetworkfactory.cpp
index a7d404b7f..94bdadadd 100755
--- a/src/librssguard/services/gmail/gmailnetworkfactory.cpp
+++ b/src/librssguard/services/gmail/gmailnetworkfactory.cpp
@@ -420,7 +420,7 @@ QVariantHash GmailNetworkFactory::getProfile(const QNetworkProxy& custom_proxy)
 void GmailNetworkFactory::onTokensError(const QString& error, const QString& error_description) {
   Q_UNUSED(error)
 
-  qApp->showGuiMessage(Notification::Event::GeneralEvent,
+  qApp->showGuiMessage(Notification::Event::LoginFailure,
                        tr("Gmail: authentication error"),
                        tr("Click this to login again. Error is: '%1'").arg(error_description),
                        QSystemTrayIcon::MessageIcon::Critical,
diff --git a/src/librssguard/services/greader/greadernetwork.cpp b/src/librssguard/services/greader/greadernetwork.cpp
index b6f5f8dfe..b7a791c31 100755
--- a/src/librssguard/services/greader/greadernetwork.cpp
+++ b/src/librssguard/services/greader/greadernetwork.cpp
@@ -1081,7 +1081,7 @@ QString GreaderNetwork::generateFullUrl(GreaderNetwork::Operations operation) co
 void GreaderNetwork::onTokensError(const QString& error, const QString& error_description) {
   Q_UNUSED(error)
 
-  qApp->showGuiMessage(Notification::Event::GeneralEvent,
+  qApp->showGuiMessage(Notification::Event::LoginFailure,
                        tr("Inoreader: authentication error"),
                        tr("Click this to login again. Error is: '%1'").arg(error_description),
                        QSystemTrayIcon::MessageIcon::Critical,
@@ -1106,8 +1106,8 @@ void GreaderNetwork::onAuthFailed() {
 
 void GreaderNetwork::initializeOauth() {
 #if defined(INOREADER_OFFICIAL_SUPPORT)
-  m_oauth2->setClientSecretId(TextFactory::decrypt(INOREADER_CLIENT_ID, OAUTH_DECRYPTION_KEY));
-  m_oauth2->setClientSecretSecret(TextFactory::decrypt(INOREADER_CLIENT_SECRET, OAUTH_DECRYPTION_KEY));
+  m_oauth->setClientSecretId(TextFactory::decrypt(INOREADER_CLIENT_ID, OAUTH_DECRYPTION_KEY));
+  m_oauth->setClientSecretSecret(TextFactory::decrypt(INOREADER_CLIENT_SECRET, OAUTH_DECRYPTION_KEY));
 #endif
 
   m_oauth->setRedirectUrl(QString(OAUTH_REDIRECT_URI) +