Apply MainActor to Mac menus

Passepartout/App/Mac/MacBundle.swift

@@ -32,6 +32,7 @@ class MacBundle {
 
     private lazy var bridgeDelegate = MacBundleDelegate(bundle: self)
 
+    @MainActor
     func configure() {
         guard let bundleURL = Bundle.main.builtInPlugInsURL?.appendingPathComponent(Constants.Plugins.macBridgeName) else {
             fatalError("Unable to find Mac bundle in plugins")

Passepartout/AppShared/Mac/MacMenu.swift

@@ -25,6 +25,7 @@
 
 import Foundation
 
+@MainActor
 @objc
 public protocol MacMenu {
     var delegate: MacMenuDelegate? { get set }

Passepartout/AppShared/Mac/Models/LightProfileManager.swift

@@ -46,6 +46,7 @@ extension LightProfile {
     }
 }
 
+@MainActor
 @objc
 public protocol LightProfileManager {
     var hasProfiles: Bool { get }

Passepartout/AppShared/Mac/Models/LightProviderManager.swift

@@ -56,6 +56,7 @@ public protocol LightProviderServer {
     var serverId: String { get }
 }
 
+@MainActor
 @objc
 public protocol LightProviderManager {
     var delegate: LightProviderManagerDelegate? { get set }

Passepartout/AppShared/Mac/Models/LightVPNManager.swift

@@ -36,6 +36,7 @@ public enum LightVPNStatus: Int {
     case disconnected
 }
 
+@MainActor
 @objc
 public protocol LightVPNManager {
     var isEnabled: Bool { get }

Passepartout/Mac/Menu/HostProfileItem+ViewModel.swift

@@ -26,6 +26,8 @@
 import Foundation
 
 extension HostProfileItem {
+
+    @MainActor
     class ViewModel {
         let profile: LightProfile
 
@@ -41,7 +43,9 @@ extension HostProfileItem {
         }
 
         deinit {
-            vpnManager.removeDelegate(withIdentifier: profile.id.uuidString)
+            Task { @MainActor in
+                vpnManager.removeDelegate(withIdentifier: profile.id.uuidString)
+            }
         }
 
         @objc func connectTo() {

Passepartout/Mac/Menu/PassepartoutMenu+StatusButton.swift

@@ -27,6 +27,8 @@ import Foundation
 import AppKit
 
 extension PassepartoutMenu {
+
+    @MainActor
     class StatusButton {
         private lazy var statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
 
@@ -50,7 +52,9 @@ extension PassepartoutMenu {
         }
 
         deinit {
-            vpnManager.removeDelegate(withIdentifier: "PassepartoutMenu")
+            Task { @MainActor in
+                vpnManager.removeDelegate(withIdentifier: "PassepartoutMenu")
+            }
         }
 
         func install(systemMenu: SystemMenu) {

Passepartout/Mac/Menu/PassepartoutMenu.swift

@@ -26,6 +26,7 @@
 import Foundation
 import AppKit
 
+@MainActor
 class PassepartoutMenu {
     private let macMenuDelegate: MacMenuDelegate
 

Passepartout/Mac/Menu/ProviderLocationItem+ViewModel.swift

@@ -47,6 +47,7 @@ extension ProviderLocationItem {
             location.servers.count == 1
         }
 
+        @MainActor
         @objc func connectTo() {
             guard isOnlyServer else {
                 fatalError("Connecting to a location with multiple servers?")

Passepartout/Mac/Menu/ProviderProfileItem+ViewModel.swift

@@ -26,6 +26,8 @@
 import Foundation
 
 extension ProviderProfileItem {
+
+    @MainActor
     class ViewModel {
         let profile: LightProfile
 
@@ -44,7 +46,9 @@ extension ProviderProfileItem {
         }
 
         deinit {
-            vpnManager.removeDelegate(withIdentifier: profile.id.uuidString)
+            Task { @MainActor in
+                vpnManager.removeDelegate(withIdentifier: profile.id.uuidString)
+            }
         }
 
         private var providerName: String {

Passepartout/Mac/Menu/ProviderServerItem+ViewModel.swift

@@ -43,6 +43,7 @@ extension ProviderServerItem {
             server.serverId == profile.providerServer?.serverId
         }
 
+        @MainActor
         @objc func connectTo() {
             vpnManager.connect(with: profile.id, to: server.serverId)
         }

Passepartout/Mac/Menu/VPNItemGroup+ViewModel.swift

@@ -27,6 +27,8 @@ import Foundation
 import Combine
 
 extension VPNItemGroup {
+
+    @MainActor
     class ViewModel {
         private let vpnManager: LightVPNManager
 
@@ -51,7 +53,9 @@ extension VPNItemGroup {
         }
 
         deinit {
-            vpnManager.removeDelegate(withIdentifier: "VPNItemGroup")
+            Task { @MainActor in
+                vpnManager.removeDelegate(withIdentifier: "VPNItemGroup")
+            }
         }
 
         var toggleTitle: String {

Passepartout/Mac/Menu/VPNItemGroup.swift

@@ -26,6 +26,7 @@
 import Foundation
 import AppKit
 
+@MainActor
 struct VPNItemGroup: ItemGroup {
     private let viewModel: ViewModel
 

Passepartout/Mac/PassepartoutMac.swift

@@ -32,5 +32,6 @@ class PassepartoutMac: NSObject, MacBridge {
 
     let utils: MacUtils = DefaultMacUtils()
 
+    @MainActor
     let menu: MacMenu = DefaultMacMenu()
 }

Passepartout/Mac/Reusable/ItemGroup.swift

@@ -26,6 +26,7 @@
 import Foundation
 import AppKit
 
+@MainActor
 protocol ItemGroup {
     func asMenuItems(withParent parent: NSMenu) -> [NSMenuItem]
 }

Passepartout/Mac/Reusable/SystemMenu.swift

@@ -26,6 +26,7 @@
 import Foundation
 import AppKit
 
+@MainActor
 protocol SystemMenu {
     var asMenu: NSMenu { get }
 }