From 110d68e4b27e7119016ba5e0b85de801b419adcf Mon Sep 17 00:00:00 2001 From: Maurice Parker Date: Fri, 18 Dec 2020 16:13:26 -0600 Subject: [PATCH] Change CloudKit error handling so that we still try to sync, even if we get some feed errors. --- .../CloudKit/CloudKitAccountDelegate.swift | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift b/Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift index 0f6cfac57..91b0d4efa 100644 --- a/Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift +++ b/Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift @@ -547,15 +547,14 @@ private extension CloudKitAccountDelegate { case .success: self.refreshProgress.completeTask() self.combinedRefresh(account, webFeeds) { result in - switch result { - case .success: - self.sendArticleStatus(for: account, showProgress: true) { _ in - self.refreshProgress.clear() - account.metadata.lastArticleFetchEndTime = Date() - } - case .failure(let error): + self.sendArticleStatus(for: account, showProgress: true) { _ in self.refreshProgress.clear() - fail(error) + if case .failure(let error) = result { + fail(error) + } else { + account.metadata.lastArticleFetchEndTime = Date() + completion(.success(())) + } } } case .failure(let error):