Make MainThreadOperationQueue MainActor.

Account/Sources/Account/CloudKit/CloudKitAccountDelegate.swift

@@ -42,7 +42,7 @@ final class CloudKitAccountDelegate: AccountDelegate {
 	private let accountZone: CloudKitAccountZone
 	private let articlesZone: CloudKitArticlesZone
 	
-	private let mainThreadOperationQueue = MainThreadOperationQueue()
+	@MainActor private let mainThreadOperationQueue = MainThreadOperationQueue()
 
 	private lazy var refresher: LocalAccountRefresher = {
 		let refresher = LocalAccountRefresher()

Account/Sources/Account/CloudKit/CloudKitReceiveStatusOperation.swift

@@ -27,7 +27,7 @@ class CloudKitReceiveStatusOperation: MainThreadOperation {
 		self.articlesZone = articlesZone
 	}
 	
-	func run() {
+	@MainActor func run() {
 		guard let articlesZone = articlesZone else {
 			self.operationDelegate?.operationDidComplete(self)
 			return

Account/Sources/Account/CloudKit/CloudKitRemoteNotificationOperation.swift

@@ -31,7 +31,7 @@ class CloudKitRemoteNotificationOperation: MainThreadOperation {
 		self.userInfo = userInfo
 	}
 
-	func run() {
+	@MainActor func run() {
 		guard let accountZone = accountZone, let articlesZone = articlesZone else {
 			self.operationDelegate?.operationDidComplete(self)
 			return

Account/Sources/Account/CloudKit/CloudKitSendStatusOperation.swift

@@ -41,12 +41,13 @@ class CloudKitSendStatusOperation: MainThreadOperation {
 		self.database = database
 	}
 	
-	func run() {
+	@MainActor func run() {
 		os_log(.debug, log: log, "Sending article statuses...")
 		
 		if showProgress {
 			
 			database.selectPendingCount() { result in
+				MainActor.assumeIsolated {
 					switch result {
 					case .success(let count):
 						let ticks = count / self.blockSize
@@ -57,6 +58,7 @@ class CloudKitSendStatusOperation: MainThreadOperation {
 						self.operationDelegate?.cancelOperation(self)
 					}
 				}
+			}
 			
 		} else {
 			
@@ -72,10 +74,12 @@ private extension CloudKitSendStatusOperation {
 	
 	func selectForProcessing() {
 		database.selectForProcessing(limit: blockSize) { result in
+
+			MainActor.assumeIsolated {
 				switch result {
 				case .success(let syncStatuses):
 
-				func stopProcessing() {
+					@MainActor func stopProcessing() {
 						if self.showProgress {
 							self.refreshProgress?.completeTask()
 						}
@@ -102,6 +106,7 @@ private extension CloudKitSendStatusOperation {
 				}
 			}
 		}
+	}
 	
 	func processStatuses(_ syncStatuses: [SyncStatus], completion: @escaping (Bool) -> Void) {
 		guard let account = account, let articlesZone = articlesZone else {

Account/Sources/Account/Feedly/FeedlyAccountDelegate.swift

@@ -65,7 +65,7 @@ final class FeedlyAccountDelegate: AccountDelegate {
 	private let database: SyncDatabase
 	
 	private weak var currentSyncAllOperation: MainThreadOperation?
-	private let operationQueue = MainThreadOperationQueue()
+	@MainActor private let operationQueue = MainThreadOperationQueue()
 
 	init(dataFolder: String, transport: Transport?, api: FeedlyAPICaller.API, secretsProvider: SecretsProvider) {
 		// Many operations have their own operation queues, such as the sync all operation.
@@ -550,9 +550,11 @@ final class FeedlyAccountDelegate: AccountDelegate {
 
 	/// Suspend all network activity
 	func suspendNetwork() {
+		MainActor.assumeIsolated {
 			caller.suspend()
 			operationQueue.cancelAllOperations()
 		}
+	}
 	
 	/// Suspend the SQLLite databases
 	func suspendDatabase() {
@@ -572,7 +574,7 @@ final class FeedlyAccountDelegate: AccountDelegate {
 
 extension FeedlyAccountDelegate: FeedlyAPICallerDelegate {
 	
-	func reauthorizeFeedlyAPICaller(_ caller: FeedlyAPICaller, completionHandler: @escaping (Bool) -> ()) {
+	@MainActor func reauthorizeFeedlyAPICaller(_ caller: FeedlyAPICaller, completionHandler: @escaping (Bool) -> ()) {
 		guard let account = initializedAccount else {
 			completionHandler(false)
 			return
@@ -600,8 +602,6 @@ extension FeedlyAccountDelegate: FeedlyAPICallerDelegate {
 			completionHandler(refreshAccessTokenDelegate.didReauthorize && !operation.isCanceled)
 		}
 		
-		Task { @MainActor in
 		MainThreadOperationQueue.shared.add(refreshAccessToken)
 	}
 }
-}

Account/Sources/Account/Feedly/OAuthAccountAuthorizationOperation.swift

@@ -51,7 +51,7 @@ public enum OAuthAccountAuthorizationOperationError: LocalizedError {
 		self.oauthClient = Account.oauthAuthorizationClient(for: accountType, secretsProvider: secretsProvider)
 	}
 	
-	public func run() {
+	@MainActor public func run() {
 		assert(presentationAnchor != nil, "\(self) outlived presentation anchor.")
 		
 		let request = Account.oauthAuthorizationCodeGrantRequest(for: accountType, secretsProvider: secretsProvider)
@@ -101,6 +101,7 @@ public enum OAuthAccountAuthorizationOperationError: LocalizedError {
 	}
 	
 	private func didEndAuthentication(url: URL?, error: Error?) {
+		MainActor.assumeIsolated {
 			guard !isCanceled else {
 				didFinish()
 				return
@@ -125,6 +126,7 @@ public enum OAuthAccountAuthorizationOperationError: LocalizedError {
 				didFinish(error)
 			}
 		}
+	}
 	
 	public func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
 		guard let anchor = presentationAnchor else {
@@ -174,12 +176,12 @@ public enum OAuthAccountAuthorizationOperationError: LocalizedError {
 	
 	// MARK: Managing Operation State
 	
-	private func didFinish() {
+	@MainActor private func didFinish() {
 		assert(Thread.isMainThread)
 		operationDelegate?.operationDidComplete(self)
 	}
 	
-	private func didFinish(_ error: Error) {
+	@MainActor private func didFinish(_ error: Error) {
 		assert(Thread.isMainThread)
 		delegate?.oauthAccountAuthorizationOperation(self, didFailWith: error)
 		didFinish()

Account/Sources/Account/Feedly/Operations/FeedlyAddExistingFeedOperation.swift

@@ -12,7 +12,7 @@ import RSWeb
 import Secrets
 import Core
 
-class FeedlyAddExistingFeedOperation: FeedlyOperation, FeedlyOperationDelegate, FeedlyCheckpointOperationDelegate {
+@MainActor final class FeedlyAddExistingFeedOperation: FeedlyOperation, FeedlyOperationDelegate, FeedlyCheckpointOperationDelegate {
 
 	private let operationQueue = MainThreadOperationQueue()
 	var addCompletionHandler: ((Result<Void, Error>) -> ())?

Account/Sources/Account/Feedly/Operations/FeedlyFetchIdsForMissingArticlesOperation.swift

@@ -23,6 +23,7 @@ final class FeedlyFetchIdsForMissingArticlesOperation: FeedlyOperation, FeedlyEn
 	
 	override func run() {
 		account.fetchArticleIDsForStatusesWithoutArticlesNewerThanCutoffDate { result in
+			MainActor.assumeIsolated {
 				switch result {
 				case .success(let articleIds):
 					self.entryIds.formUnion(articleIds)
@@ -34,3 +35,4 @@ final class FeedlyFetchIdsForMissingArticlesOperation: FeedlyOperation, FeedlyEn
 			}
 		}
 	}
+}

Account/Sources/Account/Feedly/Operations/FeedlyIngestStarredArticleIdsOperation.swift

@@ -78,6 +78,7 @@ final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation {
 		}
 		
 		database.selectPendingStarredStatusArticleIDs { result in
+			MainActor.assumeIsolated {
 				switch result {
 				case .success(let pendingArticleIds):
 					self.remoteEntryIds.subtract(pendingArticleIds)
@@ -89,6 +90,7 @@ final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation {
 				}
 			}
 		}
+	}
 	
 	private func updateStarredStatuses() {
 		guard !isCanceled else {
@@ -97,6 +99,7 @@ final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation {
 		}
 		
 		account.fetchStarredArticleIDs { result in
+			MainActor.assumeIsolated {
 				switch result {
 				case .success(let localStarredArticleIDs):
 					self.processStarredArticleIDs(localStarredArticleIDs)
@@ -106,6 +109,7 @@ final class FeedlyIngestStarredArticleIdsOperation: FeedlyOperation {
 				}
 			}
 		}
+	}
 	
 	func processStarredArticleIDs(_ localStarredArticleIDs: Set<String>) {
 		guard !isCanceled else {

Account/Sources/Account/Feedly/Operations/FeedlyIngestStreamArticleIdsOperation.swift

@@ -53,6 +53,7 @@ class FeedlyIngestStreamArticleIdsOperation: FeedlyOperation {
 		case .success(let streamIds):
 			account.createStatusesIfNeeded(articleIDs: Set(streamIds.ids)) { databaseError in
 
+				MainActor.assumeIsolated {
 					if let error = databaseError {
 						self.didFinish(with: error)
 						return
@@ -66,6 +67,8 @@ class FeedlyIngestStreamArticleIdsOperation: FeedlyOperation {
 
 					self.getStreamIds(continuation)
 				}
+
+			}
 		case .failure(let error):
 			didFinish(with: error)
 		}

Account/Sources/Account/Feedly/Operations/FeedlyIngestUnreadArticleIdsOperation.swift

@@ -79,6 +79,7 @@ final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation {
 		}
 		
 		database.selectPendingReadStatusArticleIDs { result in
+			MainActor.assumeIsolated {
 				switch result {
 				case .success(let pendingArticleIds):
 					self.remoteEntryIds.subtract(pendingArticleIds)
@@ -90,6 +91,7 @@ final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation {
 				}
 			}
 		}
+	}
 	
 	private func updateUnreadStatuses() {
 		guard !isCanceled else {
@@ -98,6 +100,7 @@ final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation {
 		}
 		
 		account.fetchUnreadArticleIDs { result in
+			MainActor.assumeIsolated {
 				switch result {
 				case .success(let localUnreadArticleIDs):
 					self.processUnreadArticleIDs(localUnreadArticleIDs)
@@ -107,6 +110,7 @@ final class FeedlyIngestUnreadArticleIdsOperation: FeedlyOperation {
 				}
 			}
 		}
+	}
 	
 	private func processUnreadArticleIDs(_ localUnreadArticleIDs: Set<String>) {
 		guard !isCanceled else {

Account/Sources/Account/Feedly/Operations/FeedlyOperation.swift

@@ -18,7 +18,7 @@ protocol FeedlyOperationDelegate: AnyObject {
 ///
 /// Normally we don’t do inheritance — but in this case
 /// it’s the best option.
-class FeedlyOperation: MainThreadOperation {
+@MainActor class FeedlyOperation: MainThreadOperation {
 
 	weak var delegate: FeedlyOperationDelegate?
 	var downloadProgress: DownloadProgress? {

Account/Sources/Account/Feedly/Operations/FeedlySendArticleStatusesOperation.swift

@@ -29,6 +29,7 @@ final class FeedlySendArticleStatusesOperation: FeedlyOperation {
 		os_log(.debug, log: log, "Sending article statuses...")
 
 		database.selectForProcessing { result in
+			MainActor.assumeIsolated {
 				if self.isCanceled {
 					self.didFinish()
 					return
@@ -43,6 +44,7 @@ final class FeedlySendArticleStatusesOperation: FeedlyOperation {
 			}
 		}
 	}
+}
 
 private extension FeedlySendArticleStatusesOperation {
 

Account/Sources/Account/Feedly/Operations/FeedlyUpdateAccountFeedsWithItemsOperation.swift

@@ -28,6 +28,7 @@ final class FeedlyUpdateAccountFeedsWithItemsOperation: FeedlyOperation {
 		let feedIDsAndItems = organisedItemsProvider.parsedItemsKeyedByFeedId
 		
 		account.update(feedIDsAndItems: feedIDsAndItems, defaultRead: true) { databaseError in
+			MainActor.assumeIsolated {
 				if let error = databaseError {
 					self.didFinish(with: error)
 					return
@@ -38,3 +39,4 @@ final class FeedlyUpdateAccountFeedsWithItemsOperation: FeedlyOperation {
 			}
 		}
 	}
+}

Core/Sources/Core/MainThreadOperation.swift

@@ -75,15 +75,15 @@ public protocol MainThreadOperation: AnyObject {
 
 public extension MainThreadOperation {
 
-	func cancel() {
+	@MainActor func cancel() {
 		operationDelegate?.cancelOperation(self)
 	}
 
-	func addDependency(_ parentOperation: MainThreadOperation) {
+	@MainActor func addDependency(_ parentOperation: MainThreadOperation) {
 		operationDelegate?.make(self, dependOn: parentOperation)
 	}
 
-	func informOperationDelegateOfCompletion() {
+	@MainActor func informOperationDelegateOfCompletion() {
 		guard !isCanceled else {
 			return
 		}

Core/Sources/Core/MainThreadOperationQueue.swift

@@ -9,9 +9,10 @@
 import Foundation
 
 public protocol MainThreadOperationDelegate: AnyObject {
-	func operationDidComplete(_ operation: MainThreadOperation)
+	
-	func cancelOperation(_ operation: MainThreadOperation)
+	@MainActor func operationDidComplete(_ operation: MainThreadOperation)
-	func make(_ childOperation: MainThreadOperation, dependOn parentOperation: MainThreadOperation)
+	@MainActor func cancelOperation(_ operation: MainThreadOperation)
+	@MainActor func make(_ childOperation: MainThreadOperation, dependOn parentOperation: MainThreadOperation)
 }
 
 /// Manage a queue of MainThreadOperation tasks.
@@ -23,7 +24,7 @@ public protocol MainThreadOperationDelegate: AnyObject {
 /// Use this only on the main thread.
 /// The operation can be suspended and resumed.
 /// It is *not* suspended on creation.
-public final class MainThreadOperationQueue {
+@MainActor public final class MainThreadOperationQueue {
 
 	/// Use the shared queue when you don’t need to create a separate queue.
 	@MainActor public static let shared: MainThreadOperationQueue = {
@@ -46,10 +47,6 @@ public final class MainThreadOperationQueue {
 		// Silence compiler complaint about init not being public.
 	}
 
-	deinit {
-		cancelAllOperations()
-	}
-
 	/// Add an operation to the queue.
 	@MainActor public func add(_ operation: MainThreadOperation) {
 		precondition(Thread.isMainThread)
@@ -132,7 +129,7 @@ public final class MainThreadOperationQueue {
 
 extension MainThreadOperationQueue: MainThreadOperationDelegate {
 
-	public func operationDidComplete(_ operation: MainThreadOperation) {
+	@MainActor public func operationDidComplete(_ operation: MainThreadOperation) {
 		precondition(Thread.isMainThread)
 		operationDidFinish(operation)
 	}