From c9ad5fe4c00659798d75702b07c017d68db4e28a Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Wed, 29 Apr 2020 23:56:50 -0500
Subject: [PATCH] Remove initial send status since we do it at the end now

---
 .../CloudKit/CloudKitAccountDelegate.swift    | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift b/Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift
index 12d2e6f13..6efb4e244 100644
--- a/Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift
+++ b/Frameworks/Account/CloudKit/CloudKitAccountDelegate.swift
@@ -573,7 +573,7 @@ private extension CloudKitAccountDelegate {
 	func standardRefreshAll(for account: Account, completion: @escaping (Result<Void, Error>) -> Void) {
 		
 		let intialWebFeedsCount = account.flattenedWebFeeds().count
-		refreshProgress.addToNumberOfTasksAndRemaining(4 + intialWebFeedsCount)
+		refreshProgress.addToNumberOfTasksAndRemaining(3 + intialWebFeedsCount)
 
 		func fail(_ error: Error) {
 			self.processAccountError(account, error)
@@ -585,37 +585,23 @@ private extension CloudKitAccountDelegate {
 			switch result {
 			case .success:
 				
+				self.refreshProgress.completeTask()
 				let webFeeds = account.flattenedWebFeeds()
 				self.refreshProgress.addToNumberOfTasksAndRemaining(webFeeds.count - intialWebFeedsCount)
-
-				self.refreshProgress.completeTask()
-				self.sendArticleStatus(for: account) { result in
+				
+				self.refreshArticleStatus(for: account) { result in
 					switch result {
 					case .success:
-						
 						self.refreshProgress.completeTask()
-						self.refreshArticleStatus(for: account) { result in
-							switch result {
-							case .success:
-
-								self.refreshProgress.completeTask()
-
-								self.combinedRefresh(account, webFeeds) {
-									self.refreshProgress.clear()
-									account.metadata.lastArticleFetchEndTime = Date()
-								}
-
-							case .failure(let error):
-								fail(error)
-							}
+						self.combinedRefresh(account, webFeeds) {
+							self.refreshProgress.clear()
+							account.metadata.lastArticleFetchEndTime = Date()
 						}
-						
 					case .failure(let error):
 						fail(error)
 					}
-
 				}
-				
+
 			case .failure(let error):
 				fail(error)
 			}