From ab8611f2b29937a1bf7f086eb4817b7da3359843 Mon Sep 17 00:00:00 2001
From: Maurice Parker <mo@vincode.io>
Date: Sat, 12 Nov 2022 19:05:06 -0600
Subject: [PATCH] Change the move to foreground sync to use the same date to
 trigger it as the label

---
 Account/Sources/Account/AccountManager.swift |  3 +++
 iOS/AppDefaults.swift                        | 10 ----------
 iOS/AppDelegate.swift                        |  7 +------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/Account/Sources/Account/AccountManager.swift b/Account/Sources/Account/AccountManager.swift
index 07bd893d9..836cf0603 100644
--- a/Account/Sources/Account/AccountManager.swift
+++ b/Account/Sources/Account/AccountManager.swift
@@ -70,6 +70,9 @@ public final class AccountManager: UnreadCountProvider {
 				if lastArticleFetchEndTime == nil || lastArticleFetchEndTime! < accountLastArticleFetchEndTime {
 					lastArticleFetchEndTime = accountLastArticleFetchEndTime
 				}
+			} else {
+				lastArticleFetchEndTime = nil
+				break
 			}
 		}
 		return lastArticleFetchEndTime
diff --git a/iOS/AppDefaults.swift b/iOS/AppDefaults.swift
index 4c6ec9d75..10ed0af43 100644
--- a/iOS/AppDefaults.swift
+++ b/iOS/AppDefaults.swift
@@ -53,7 +53,6 @@ final class AppDefaults {
 		static let articleFullscreenEnabled = "articleFullscreenEnabled"
 		static let hasUsedFullScreenPreviously = "hasUsedFullScreenPreviously"
 		static let confirmMarkAllAsRead = "confirmMarkAllAsRead"
-		static let lastRefresh = "lastRefresh"
 		static let addWebFeedAccountID = "addWebFeedAccountID"
 		static let addWebFeedFolderName = "addWebFeedFolderName"
 		static let addFolderAccountID = "addFolderAccountID"
@@ -196,15 +195,6 @@ final class AppDefaults {
 		}
 	}
 	
-	var lastRefresh: Date? {
-		get {
-			return AppDefaults.date(for: Key.lastRefresh)
-		}
-		set {
-			AppDefaults.setDate(for: Key.lastRefresh, newValue)
-		}
-	}
-	
 	var timelineNumberOfLines: Int {
 		get {
 			return AppDefaults.int(for: Key.timelineNumberOfLines)
diff --git a/iOS/AppDelegate.swift b/iOS/AppDelegate.swift
index 75e32552a..bf145a3b0 100644
--- a/iOS/AppDelegate.swift
+++ b/iOS/AppDelegate.swift
@@ -74,7 +74,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 		FeedProviderManager.shared.delegate = ExtensionPointManager.shared
 		
 		NotificationCenter.default.addObserver(self, selector: #selector(unreadCountDidChange(_:)), name: .UnreadCountDidChange, object: nil)
-		NotificationCenter.default.addObserver(self, selector: #selector(accountRefreshDidFinish(_:)), name: .AccountRefreshDidFinish, object: nil)
 	}
 	
 	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
@@ -151,10 +150,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 		}
 	}
 	
-	@objc func accountRefreshDidFinish(_ note: Notification) {
-		AppDefaults.shared.lastRefresh = Date()
-	}
-	
 	// MARK: - API
 	
 	func manualRefresh(errorHandler: @escaping (Error) -> ()) {
@@ -184,7 +179,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
 		extensionFeedAddRequestFile.resume()
 		syncTimer?.update()
 
-		if let lastRefresh = AppDefaults.shared.lastRefresh {
+		if let lastRefresh = AccountManager.shared.lastArticleFetchEndTime {
 			if Date() > lastRefresh.addingTimeInterval(15 * 60) {
 				AccountManager.shared.refreshAll(errorHandler: ErrorHandler.log)
 			} else {