diff --git a/resources/graphics/misc/reedah.png b/resources/graphics/misc/reedah.png
new file mode 100644
index 000000000..e33bd3be1
Binary files /dev/null and b/resources/graphics/misc/reedah.png differ
diff --git a/resources/rssguard.qrc b/resources/rssguard.qrc
index 22722de10..d270a1c77 100755
--- a/resources/rssguard.qrc
+++ b/resources/rssguard.qrc
@@ -24,6 +24,7 @@
graphics/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;