From a8f8e5f9555d368d09a831f086ada5651f2b2abb Mon Sep 17 00:00:00 2001 From: Anh Do Date: Sun, 29 Nov 2020 22:23:57 -0500 Subject: [PATCH] Remove refreshStories from refreshAll process --- .../NewsBlur/NewsBlurAccountDelegate.swift | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/Account/Sources/Account/NewsBlur/NewsBlurAccountDelegate.swift b/Account/Sources/Account/NewsBlur/NewsBlurAccountDelegate.swift index 6776c90a1..638f3d19f 100644 --- a/Account/Sources/Account/NewsBlur/NewsBlurAccountDelegate.swift +++ b/Account/Sources/Account/NewsBlur/NewsBlurAccountDelegate.swift @@ -63,7 +63,7 @@ final class NewsBlurAccountDelegate: AccountDelegate { } func refreshAll(for account: Account, completion: @escaping (Result) -> ()) { - self.refreshProgress.addToNumberOfTasksAndRemaining(5) + self.refreshProgress.addToNumberOfTasksAndRemaining(4) refreshFeeds(for: account) { result in self.refreshProgress.completeTask() @@ -80,31 +80,21 @@ final class NewsBlurAccountDelegate: AccountDelegate { switch result { case .success: - self.refreshStories(for: account) { result in + self.refreshMissingStories(for: account) { result in self.refreshProgress.completeTask() switch result { case .success: - self.refreshMissingStories(for: account) { result in - self.refreshProgress.completeTask() - - switch result { - case .success: - DispatchQueue.main.async { - completion(.success(())) - } - - case .failure(let error): - DispatchQueue.main.async { - self.refreshProgress.clear() - let wrappedError = AccountError.wrappedError(error: error, account: account) - completion(.failure(wrappedError)) - } - } + DispatchQueue.main.async { + completion(.success(())) } case .failure(let error): - completion(.failure(error)) + DispatchQueue.main.async { + self.refreshProgress.clear() + let wrappedError = AccountError.wrappedError(error: error, account: account) + completion(.failure(wrappedError)) + } } }