From 6fb0e2e0d099bace1c22ba267ba81dff7d5aee70 Mon Sep 17 00:00:00 2001 From: Kiel Gillard Date: Wed, 18 Dec 2019 09:32:58 +1100 Subject: [PATCH] Honour the error case when ingesting read and star statuses --- .../FeedlySetStarredArticlesOperation.swift | 11 ++++++----- .../Operations/FeedlySetUnreadArticlesOperation.swift | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Frameworks/Account/Feedly/Operations/FeedlySetStarredArticlesOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlySetStarredArticlesOperation.swift index c7713d6ff..1a9a8384d 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlySetStarredArticlesOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlySetStarredArticlesOperation.swift @@ -32,12 +32,13 @@ final class FeedlySetStarredArticlesOperation: FeedlyOperation { return } - account.fetchStarredArticleIDs { (articleIDsResult) in - if let localStarredArticleIDs = try? articleIDsResult.get() { + account.fetchStarredArticleIDs { result in + switch result { + case .success(let localStarredArticleIDs): self.processStarredArticleIDs(localStarredArticleIDs) - } - else { - self.didFinish() + + case .failure(let error): + self.didFinish(error) } } } diff --git a/Frameworks/Account/Feedly/Operations/FeedlySetUnreadArticlesOperation.swift b/Frameworks/Account/Feedly/Operations/FeedlySetUnreadArticlesOperation.swift index 6ec12bf4c..425557faa 100644 --- a/Frameworks/Account/Feedly/Operations/FeedlySetUnreadArticlesOperation.swift +++ b/Frameworks/Account/Feedly/Operations/FeedlySetUnreadArticlesOperation.swift @@ -32,12 +32,13 @@ final class FeedlySetUnreadArticlesOperation: FeedlyOperation { return } - account.fetchUnreadArticleIDs { articleIDsResult in - if let localUnreadArticleIDs = try? articleIDsResult.get() { + account.fetchUnreadArticleIDs { result in + switch result { + case .success(let localUnreadArticleIDs): self.processUnreadArticleIDs(localUnreadArticleIDs) - } - else { - self.didFinish() + + case .failure(let error): + self.didFinish(error) } } }