From fbdbc19d0bed46a5b67b5b17268a84d35c8768e3 Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Wed, 29 Apr 2020 11:07:24 -0500 Subject: [PATCH] Remove extra fetch zone changes call --- .../Account/CloudKit/CloudKitAccountDelegate.swift | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift b/Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift index 362bbf66d..440eb2076 100644 --- a/Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift +++ b/Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift @@ -538,7 +538,7 @@ private extension CloudKitAccountDelegate { completion(.failure(error)) } - refreshProgress.addToNumberOfTasksAndRemaining(2) + refreshProgress.addToNumberOfTasksAndRemaining(3) accountZone.fetchChangesInZone() { result in self.refreshProgress.completeTask() @@ -571,7 +571,7 @@ private extension CloudKitAccountDelegate { func standardRefreshAll(for account: Account, completion: @escaping (Result) -> Void) { let intialWebFeedsCount = account.flattenedWebFeeds().count - refreshProgress.addToNumberOfTasksAndRemaining(3 + intialWebFeedsCount) + refreshProgress.addToNumberOfTasksAndRemaining(4 + intialWebFeedsCount) func fail(_ error: Error) { self.processAccountError(account, error) @@ -626,8 +626,6 @@ private extension CloudKitAccountDelegate { var refresherWebFeeds = Set() let group = DispatchGroup() - refreshProgress.addToNumberOfTasksAndRemaining(3) - for webFeed in webFeeds { if let components = URLComponents(string: webFeed.url), let feedProvider = FeedProviderManager.shared.best(for: components) { group.enter() @@ -670,10 +668,8 @@ private extension CloudKitAccountDelegate { group.notify(queue: DispatchQueue.main) { self.sendArticleStatus(for: account) { _ in - self.articlesZone.fetchChangesInZone() { _ in - self.refreshProgress.completeTask() - completion() - } + self.refreshProgress.completeTask() + completion() } }