From a02ff587f667a725ffc09d80abde4fbdddc79128 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Sat, 20 Mar 2021 20:37:25 +0100 Subject: [PATCH] Add reedah icon, fix pw not saving, fix repeated tokens downloading. --- resources/graphics/misc/reedah.png | Bin 0 -> 6997 bytes resources/rssguard.qrc | 1 + .../services/greader/greadernetwork.cpp | 5 ++++- .../services/greader/greaderserviceroot.cpp | 8 ++++++-- 4 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 resources/graphics/misc/reedah.png diff --git a/resources/graphics/misc/reedah.png b/resources/graphics/misc/reedah.png new file mode 100644 index 0000000000000000000000000000000000000000..e33bd3be1397e8e449e2882c8cac09c1a78ae70d GIT binary patch literal 6997 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/misc/image-placeholder.png graphics/misc/inoreader.png graphics/misc/nextcloud.png + graphics/misc/reedah.png graphics/misc/theoldreader.png graphics/misc/tt-rss.png diff --git a/src/librssguard/services/greader/greadernetwork.cpp b/src/librssguard/services/greader/greadernetwork.cpp index 40659d153..dd1b49d85 100755 --- a/src/librssguard/services/greader/greadernetwork.cpp +++ b/src/librssguard/services/greader/greadernetwork.cpp @@ -464,7 +464,7 @@ QPair GreaderNetwork::authHeader() const { } bool GreaderNetwork::ensureLogin(const QNetworkProxy& proxy, QNetworkReply::NetworkError* output) { - if (m_authSid.isEmpty()) { + if (m_authSid.isEmpty() && m_authAuth.isEmpty()) { auto login = clientLogin(proxy); if (output != nullptr) { @@ -477,6 +477,9 @@ bool GreaderNetwork::ensureLogin(const QNetworkProxy& proxy, QNetworkReply::Netw << QUOTE_W_SPACE_DOT(NetworkFactory::networkErrorText(login)); return false; } + else { + qDebugNN << LOGSEC_GREADER << "Login successful."; + } } return true; diff --git a/src/librssguard/services/greader/greaderserviceroot.cpp b/src/librssguard/services/greader/greaderserviceroot.cpp index 837049e55..b0367c6cc 100755 --- a/src/librssguard/services/greader/greaderserviceroot.cpp +++ b/src/librssguard/services/greader/greaderserviceroot.cpp @@ -2,9 +2,9 @@ #include "services/greader/greaderserviceroot.h" +#include "database/databasequeries.h" #include "definitions/definitions.h" #include "miscellaneous/application.h" -#include "database/databasequeries.h" #include "miscellaneous/iconfactory.h" #include "miscellaneous/mutex.h" #include "miscellaneous/textfactory.h" @@ -49,7 +49,7 @@ QVariantHash GreaderServiceRoot::customDatabaseData() const { void GreaderServiceRoot::setCustomDatabaseData(const QVariantHash& data) { m_network->setService(GreaderServiceRoot::Service(data["service"].toInt())); m_network->setUsername(data["username"].toString()); - TextFactory::decrypt(data["password"].toString()); + m_network->setPassword(TextFactory::decrypt(data["password"].toString())); m_network->setBaseUrl(data["url"].toString()); m_network->setBatchSize(data["batch_size"].toInt()); } @@ -185,6 +185,10 @@ void GreaderServiceRoot::updateTitleIcon() { setIcon(qApp->icons()->miscIcon(QSL("bazqux"))); break; + case Service::Reedah: + setIcon(qApp->icons()->miscIcon(QSL("reedah"))); + break; + default: setIcon(GreaderEntryPoint().icon()); break;