Specify nonisolation in PacketTunnelActor

mullvad · Aug 19, 2024 · 48691d3 · 48691d3
1 parent 2b37ca7
commit 48691d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift
@@ -15,9 +15,7 @@ extension PacketTunnelActor {
      `NEPacketTunnelProvider` provides the corresponding lifecycle method.
      */
     public nonisolated func onWake() {
-        Task {
-            await tunnelMonitor.onWake()
-        }
+        tunnelMonitor.onWake()
     }
 
     /**
@@ -26,8 +24,6 @@ extension PacketTunnelActor {
      `NEPacketTunnelProvider` provides the corresponding lifecycle method.
      */
     public nonisolated func onSleep() {
-        Task {
-            await tunnelMonitor.onSleep()
-        }
+        tunnelMonitor.onSleep()
     }
 }
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor.swift
@@ -37,11 +37,11 @@ public actor PacketTunnelActor {
 
     @Published internal(set) public var observedState: ObservedState = .initial
 
-    let logger = Logger(label: "PacketTunnelActor")
+    nonisolated let logger = Logger(label: "PacketTunnelActor")
 
     let timings: PacketTunnelActorTimings
     let tunnelAdapter: TunnelAdapterProtocol
-    let tunnelMonitor: TunnelMonitorProtocol
+    nonisolated let tunnelMonitor: TunnelMonitorProtocol
     let defaultPathObserver: DefaultPathObserverProtocol
     let blockedStateErrorMapper: BlockedStateErrorMapperProtocol
     public let relaySelector: RelaySelectorProtocol
@@ -87,7 +87,7 @@ public actor PacketTunnelActor {
             for await event in channel {
                 guard let self else { return }
 
-                await self.logger.debug("Received event: \(event.logFormat())")
+                self.logger.debug("Received event: \(event.logFormat())")
 
                 let effects = await self.runReducer(event)