diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2024-08-19 11:54:27 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-08-19 14:49:00 +0200 |
| commit | 48691d3bd0fad5d4e41974559ed6d59d32c3b9ac (patch) | |
| tree | 114b4bdf9669cc3b9ffb38c12500a3230d6ca4ff | |
| parent | 2b37ca7b23ce2b557003997758a1be0735f43545 (diff) | |
| download | mullvadvpn-48691d3bd0fad5d4e41974559ed6d59d32c3b9ac.tar.xz mullvadvpn-48691d3bd0fad5d4e41974559ed6d59d32c3b9ac.zip | |
Specify nonisolation in PacketTunnelActor
| -rw-r--r-- | ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift | 8 | ||||
| -rw-r--r-- | ios/PacketTunnelCore/Actor/PacketTunnelActor.swift | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor+SleepCycle.swift index 0f83178747..c6339ce11e 100644 --- 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 index 77989f97df..727b162157 100644 --- 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) |
