Continue adopting @MainActor.

This commit is contained in:
Brent Simmons
2023-04-05 18:35:34 -07:00
parent 1f9305eb9a
commit 8bbf4d8c60
6 changed files with 9 additions and 7 deletions

View File

@@ -246,7 +246,7 @@ public final class AccountManager: UnreadCountProvider {
}
}
public func refreshAll(errorHandler: @escaping (Error) -> Void, completion: (() -> Void)? = nil) {
public func refreshAll(errorHandler: @escaping @MainActor (Error) -> Void, completion: (() -> Void)? = nil) {
guard let reachability = try? Reachability(hostname: "apple.com"), reachability.connection != .unavailable else { return }
let group = DispatchGroup()
@@ -259,7 +259,9 @@ public final class AccountManager: UnreadCountProvider {
case .success:
break
case .failure(let error):
errorHandler(error)
Task { @MainActor in
errorHandler(error)
}
}
}
}

View File

@@ -10,7 +10,7 @@ import Foundation
import WebKit
import Articles
class DetailIconSchemeHandler: NSObject, WKURLSchemeHandler {
final class DetailIconSchemeHandler: NSObject, WKURLSchemeHandler {
var currentArticle: Article?

View File

@@ -9,7 +9,7 @@
import AppKit
import Articles
final class DetailStatusBarView: NSView {
@MainActor final class DetailStatusBarView: NSView {
@IBOutlet var urlLabel: NSTextField!

View File

@@ -20,7 +20,7 @@ enum DetailState: Equatable {
case extracted(Article, ExtractedArticle, CGFloat?)
}
final class DetailViewController: NSViewController, WKUIDelegate {
@MainActor final class DetailViewController: NSViewController, WKUIDelegate {
@IBOutlet var containerView: DetailContainerView!
@IBOutlet var statusBarView: DetailStatusBarView!

View File

@@ -10,7 +10,7 @@ import AppKit
import WebKit
import RSCore
final class DetailWebView: WKWebView {
@MainActor final class DetailWebView: WKWebView {
weak var keyboardDelegate: KeyboardDelegate?

View File

@@ -17,7 +17,7 @@ protocol DetailWebViewControllerDelegate: AnyObject {
func mouseDidExit(_: DetailWebViewController)
}
final class DetailWebViewController: NSViewController {
@MainActor final class DetailWebViewController: NSViewController {
weak var delegate: DetailWebViewControllerDelegate?
var webView: DetailWebView!