From 0fbe57b9216ed2388d451b48e95138d72ca96aa7 Mon Sep 17 00:00:00 2001 From: Martin Rotter <rotter.martinos@gmail.com> Date: Tue, 26 Sep 2017 22:14:59 +0200 Subject: [PATCH] Prepare for msgs downloading. --- src/services/inoreader/inoreaderfeed.cpp | 5 ++++- src/services/inoreader/network/inoreadernetworkfactory.cpp | 2 ++ src/services/inoreader/network/inoreadernetworkfactory.h | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/services/inoreader/inoreaderfeed.cpp b/src/services/inoreader/inoreaderfeed.cpp index 29da83a8b..7d4e2c232 100755 --- a/src/services/inoreader/inoreaderfeed.cpp +++ b/src/services/inoreader/inoreaderfeed.cpp @@ -21,6 +21,7 @@ #include "miscellaneous/application.h" #include "miscellaneous/iconfactory.h" #include "services/inoreader/inoreaderserviceroot.h" +#include "services/inoreader/network/inoreadernetworkfactory.h" InoreaderFeed::InoreaderFeed(RootItem* parent) : Feed(parent) {} @@ -31,5 +32,7 @@ InoreaderServiceRoot* InoreaderFeed::serviceRoot() const { } QList<Message> InoreaderFeed::obtainNewMessages(bool* error_during_obtaining) { - return QList<Message>(); + QList<Message> messages = serviceRoot()->network()->messages(customId(), error_during_obtaining); + + return messages; } diff --git a/src/services/inoreader/network/inoreadernetworkfactory.cpp b/src/services/inoreader/network/inoreadernetworkfactory.cpp index a04207303..6936fd26e 100755 --- a/src/services/inoreader/network/inoreadernetworkfactory.cpp +++ b/src/services/inoreader/network/inoreadernetworkfactory.cpp @@ -101,6 +101,8 @@ RootItem* InoreaderNetworkFactory::feedsCategories(bool obtain_icons) { return decodeFeedCategoriesData(category_data, feed_data, obtain_icons); } +QList<Message> InoreaderNetworkFactory::messages(const QString& stream_id, bool* is_error) {} + RootItem* InoreaderNetworkFactory::decodeFeedCategoriesData(const QString& categories, const QString& feeds, bool obtain_icons) { RootItem* parent = new RootItem(); QJsonArray json = QJsonDocument::fromJson(categories.toUtf8()).object()["tags"].toArray(); diff --git a/src/services/inoreader/network/inoreadernetworkfactory.h b/src/services/inoreader/network/inoreadernetworkfactory.h index 1bc7635b9..d8fc7388d 100755 --- a/src/services/inoreader/network/inoreadernetworkfactory.h +++ b/src/services/inoreader/network/inoreadernetworkfactory.h @@ -21,6 +21,8 @@ #include <QObject> +#include "core/message.h" + #include <QNetworkReply> class RootItem; @@ -46,6 +48,8 @@ class InoreaderNetworkFactory : public QObject { // Returned items do not have primary IDs assigned. RootItem* feedsCategories(bool obtain_icons); + QList<Message> messages(const QString& stream_id, bool* is_error); + private: RootItem* decodeFeedCategoriesData(const QString& categories, const QString& feeds, bool obtain_icons);