pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert ugly code.

Browse source
This commit is contained in:
Martin Rotter 2016-04-21 06:42:02 +02:00
parent 65153f8f54
commit ce30478a4b
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/services/owncloud/network/owncloudnetworkfactory.cpp
View file

@ -179,12 +179,11 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories() {
bool OwnCloudNetworkFactory::deleteFeed(int feed_id) { bool OwnCloudNetworkFactory::deleteFeed(int feed_id) {
QString final_url = m_urlDeleteFeed.arg(QString::number(feed_id)); QString final_url = m_urlDeleteFeed.arg(QString::number(feed_id));
QByteArray result_raw;
NetworkResult network_reply = NetworkFactory::performNetworkOperation(final_url, NetworkResult network_reply = NetworkFactory::performNetworkOperation(final_url,
qApp->settings()->value(GROUP(Feeds), qApp->settings()->value(GROUP(Feeds),
SETTING(Feeds::UpdateTimeout)).toInt(), SETTING(Feeds::UpdateTimeout)).toInt(),
QByteArray(), QString(), QByteArray(), QString(),
result_raw, QNetworkAccessManager::DeleteOperation, QByteArray(), QNetworkAccessManager::DeleteOperation,
true, m_authUsername, m_authPassword, true); true, m_authUsername, m_authPassword, true);
m_lastError = network_reply.first; m_lastError = network_reply.first;
@ -440,7 +439,7 @@ QString OwnCloudUserResponse::userId() const {
QDateTime OwnCloudUserResponse::lastLoginTime() const { QDateTime OwnCloudUserResponse::lastLoginTime() const {
if (isLoaded()) { if (isLoaded()) {
return QDateTime::fromMSecsSinceEpoch(m_rawContent["lastLoginTimestamp"].toDouble()); return QDateTime::fromMSecsSinceEpoch(m_rawContent["lastLoginTimestamp"].toVariant().value<qint64>());
} }
else { else {
return QDateTime(); return QDateTime();
@ -563,7 +562,7 @@ QList<Message> OwnCloudGetMessagesResponse::messages() const {
msg.m_author = message_map["author"].toString(); msg.m_author = message_map["author"].toString();
msg.m_contents = message_map["body"].toString(); msg.m_contents = message_map["body"].toString();
msg.m_created = TextFactory::parseDateTime(message_map["pubDate"].toDouble() * 1000); msg.m_created = TextFactory::parseDateTime(message_map["pubDate"].toVariant().value<qint64>() * 1000);
msg.m_createdFromFeed = true; msg.m_createdFromFeed = true;
msg.m_customId = message_map["id"].toString(); msg.m_customId = message_map["id"].toString();
msg.m_customHash = message_map["guidHash"].toString(); msg.m_customHash = message_map["guidHash"].toString();

22
src/services/tt-rss/network/ttrssnetworkfactory.cpp
View file

@ -82,9 +82,9 @@ TtRssLoginResponse TtRssNetworkFactory::login() {
} }
QJsonObject json; QJsonObject json;
json.insert(QSL("op"), QJsonValue(QSL("login"))); json["op"] = "login";
json.insert(QSL("user"), QJsonValue(m_username)); json["user"] = m_username;
json.insert(QSL("password"), QJsonValue(m_password)); json["password"] = 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.insert(QSL("op"), QJsonValue(QSL("logout"))); json["op"] = "logout";
json.insert(QSL("sid"), QJsonValue(m_sessionId)); json["sid"] = 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.insert(QSL("op"), QJsonValue(QSL("getFeedTree"))); json["op"] = "getFeedTree";
json.insert(QSL("sid"), QJsonValue(m_sessionId)); json["sid"] = m_sessionId;
json.insert(QSL("include_empty"), QJsonValue(true)); json["include_empty"] = 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.insert(QSL("sid"), QJsonValue(m_sessionId)); json["sid"] = 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.insert(QSL("sid"), QJsonValue(m_sessionId)); json["sid"] = 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,
@ -548,7 +548,7 @@ QList<Message> TtRssGetHeadlinesResponse::messages() const {
// Multiply by 1000 because Tiny Tiny RSS API does not include miliseconds in Unix // Multiply by 1000 because Tiny Tiny RSS API does not include miliseconds in Unix
// date/time number. // date/time number.
message.m_created = TextFactory::parseDateTime(mapped["updated"].toDouble() * 1000); message.m_created = TextFactory::parseDateTime(mapped["updated"].toVariant().value<qint64>() * 1000);
message.m_createdFromFeed = true; message.m_createdFromFeed = true;
message.m_customId = mapped["id"].toString(); message.m_customId = mapped["id"].toString();
message.m_feedId = mapped["feed_id"].toString(); message.m_feedId = mapped["feed_id"].toString();