diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 0fccbcbc8..e5dcfdc46 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index 48831ff5a..e96e8c1a0 100755 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -360,6 +360,11 @@ void Application::restoreDatabaseSettings(bool restore_database, bool restore_se } void Application::parseCmdArgumentsFromOtherInstance(const QString& message) { + if (message.isEmpty()) { + qDebugNN << LOGSEC_CORE << "No execution message received from other app instances."; + return; + } + qDebugNN << LOGSEC_CORE << "Received" << QUOTE_W_SPACE(message) diff --git a/src/librssguard/services/greader/greadernetwork.cpp b/src/librssguard/services/greader/greadernetwork.cpp index c2b4693e7..8f4f4b583 100755 --- a/src/librssguard/services/greader/greadernetwork.cpp +++ b/src/librssguard/services/greader/greadernetwork.cpp @@ -379,13 +379,17 @@ QNetworkReply::NetworkError GreaderNetwork::clientLogin(const QNetworkProxy& pro QString full_url = generateFullUrl(Operations::ClientLogin); auto timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); QByteArray output; - QByteArray args = QSL("Email=%1&Passwd=%2").arg(username(), password()).toUtf8(); + QByteArray args = QSL("Email=%1&Passwd=%2").arg(QString::fromLocal8Bit(QUrl::toPercentEncoding(username())), + QString::fromLocal8Bit(QUrl::toPercentEncoding(password()))).toLocal8Bit(); auto network_result = NetworkFactory::performNetworkOperation(full_url, timeout, args, output, QNetworkAccessManager::Operation::PostOperation, - {}, + { { + QSL(HTTP_HEADERS_CONTENT_TYPE).toLocal8Bit(), + QSL("application/x-www-form-urlencoded").toLocal8Bit() + } }, false, {}, {},