FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix comp.

Browse Source
This commit is contained in:
Martin Rotter 2016-04-20 20:49:45 +02:00
parent 75626b1496
commit 65153f8f54
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/services/tt-rss/network/ttrssnetworkfactory.cpp
View File

@ -82,9 +82,9 @@ TtRssLoginResponse TtRssNetworkFactory::login() {
} }
QJsonObject json; QJsonObject json;
json["op"] = "login"; json.insert(QSL("op"), QJsonValue(QSL("login")));
json["user"] = m_username; json.insert(QSL("user"), QJsonValue(m_username));
json["password"] = m_password; json.insert(QSL("password"), QJsonValue(m_password));
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, qApp->settings()->value(GROUP(Feeds), NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, qApp->settings()->value(GROUP(Feeds),
@ -110,8 +110,8 @@ TtRssResponse TtRssNetworkFactory::logout() {
if (!m_sessionId.isEmpty()) { if (!m_sessionId.isEmpty()) {
QJsonObject json; QJsonObject json;
json["op"] = "logout"; json.insert(QSL("op"), QJsonValue(QSL("logout")));
json["sid"] = m_sessionId; json.insert(QSL("sid"), QJsonValue(m_sessionId));
QByteArray result_raw; QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, qApp->settings()->value(GROUP(Feeds), NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_url, qApp->settings()->value(GROUP(Feeds),
@ -141,9 +141,9 @@ TtRssResponse TtRssNetworkFactory::logout() {
TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() { TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() {
QJsonObject json; QJsonObject json;
json["op"] = "getFeedTree"; json.insert(QSL("op"), QJsonValue(QSL("getFeedTree")));
json["sid"] = m_sessionId; json.insert(QSL("sid"), QJsonValue(m_sessionId));
json["include_empty"] = true; json.insert(QSL("include_empty"), QJsonValue(true));
const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(); const int timeout = qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt();
QByteArray result_raw; QByteArray result_raw;
@ -156,7 +156,7 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() {
if (result.isNotLoggedIn()) { if (result.isNotLoggedIn()) {
// We are not logged in. // We are not logged in.
login(); login();
json["sid"] = m_sessionId; json.insert(QSL("sid"), QJsonValue(m_sessionId));
network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,
@ -197,7 +197,7 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id, int lim
if (result.isNotLoggedIn()) { if (result.isNotLoggedIn()) {
// We are not logged in. // We are not logged in.
login(); login();
json["sid"] = m_sessionId; json.insert(QSL("sid"), QJsonValue(m_sessionId));
network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw, network_reply = NetworkFactory::performNetworkOperation(m_url, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), CONTENT_TYPE, result_raw,
QNetworkAccessManager::PostOperation, QNetworkAccessManager::PostOperation,