From cbe64982c4baf26f271804a3dfdd72bc79e77f12 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 6 May 2016 07:44:32 +0200
Subject: [PATCH] Refactoring.

---
 src/services/owncloud/owncloudfeed.cpp |  6 ++----
 src/services/tt-rss/ttrssfeed.cpp      | 18 ++++++------------
 src/services/tt-rss/ttrssfeed.h        |  3 ++-
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/services/owncloud/owncloudfeed.cpp b/src/services/owncloud/owncloudfeed.cpp
index fb4a89d48..b26eec36e 100755
--- a/src/services/owncloud/owncloudfeed.cpp
+++ b/src/services/owncloud/owncloudfeed.cpp
@@ -59,7 +59,7 @@ bool OwnCloudFeed::canBeDeleted() const {
 }
 
 bool OwnCloudFeed::deleteViaGui() {
-  if (removeItself()) {
+  if (serviceRoot()->network()->deleteFeed(customId()) && removeItself()) {
     serviceRoot()->requestItemRemoval(this);
     return true;
   }
@@ -86,9 +86,7 @@ bool OwnCloudFeed::editItself(OwnCloudFeed *new_feed_data) {
 bool OwnCloudFeed::removeItself() {
   QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
 
-  return
-      serviceRoot()->network()->deleteFeed(customId()) &&
-      DatabaseQueries::deleteFeed(database, customId(), serviceRoot()->accountId());
+  return DatabaseQueries::deleteFeed(database, customId(), serviceRoot()->accountId());
 }
 
 bool OwnCloudFeed::markAsReadUnread(RootItem::ReadStatus status) {
diff --git a/src/services/tt-rss/ttrssfeed.cpp b/src/services/tt-rss/ttrssfeed.cpp
index 2a68b448c..a578721f3 100755
--- a/src/services/tt-rss/ttrssfeed.cpp
+++ b/src/services/tt-rss/ttrssfeed.cpp
@@ -112,11 +112,14 @@ bool TtRssFeed::canBeDeleted() const {
 }
 
 bool TtRssFeed::deleteViaGui() {
-  if (removeItself()) {
+  TtRssUnsubscribeFeedResponse response = serviceRoot()->network()->unsubscribeFeed(customId());
+
+  if (response.code() == UFF_OK && removeItself()) {
     serviceRoot()->requestItemRemoval(this);
     return true;
   }
   else {
+    qWarning("TT-RSS: Unsubscribing from feed failed, received JSON: '%s'", qPrintable(response.toString()));
     return false;
   }
 }
@@ -183,16 +186,7 @@ QList<Message> TtRssFeed::obtainNewMessages() {
 }
 
 bool TtRssFeed::removeItself() {
-  TtRssUnsubscribeFeedResponse response = serviceRoot()->network()->unsubscribeFeed(customId());
+  QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
 
-  if (response.code() == UFF_OK) {
-    // Feed was removed online from server, remove local data.
-    QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
-
-    return DatabaseQueries::deleteFeed(database, customId(), serviceRoot()->accountId());
-  }
-  else {
-    qWarning("TT-RSS: Unsubscribing from feed failed, received JSON: '%s'", qPrintable(response.toString()));
-    return false;
-  }
+  return DatabaseQueries::deleteFeed(database, customId(), serviceRoot()->accountId());
 }
diff --git a/src/services/tt-rss/ttrssfeed.h b/src/services/tt-rss/ttrssfeed.h
index beb0d44e6..817f05811 100755
--- a/src/services/tt-rss/ttrssfeed.h
+++ b/src/services/tt-rss/ttrssfeed.h
@@ -42,11 +42,12 @@ class TtRssFeed : public Feed {
 
     bool markAsReadUnread(ReadStatus status);
     bool cleanMessages(bool clear_only_read);
+
     bool editItself(TtRssFeed *new_feed_data);
+    bool removeItself();
 
   private:
     QList<Message> obtainNewMessages();
-    bool removeItself();
 };
 
 #endif // TTRSSFEED_H