WIP

mullvad · Oct 5, 2023 · 9be4c65 · 9be4c65
1 parent e5f95b5
commit 9be4c65
Show file tree

Hide file tree

Showing 13 changed files with 394 additions and 152 deletions.
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
diff --git a/...re/Actor/Actor+ConnectionMonitoring.swift → ...ketTunnelActor+ConnectionMonitoring.swift b/...re/Actor/Actor+ConnectionMonitoring.swift → ...ketTunnelActor+ConnectionMonitoring.swift
diff --git a/...etTunnelCore/Actor/Actor+ErrorState.swift → .../Actor/PacketTunnelActor+ErrorState.swift b/...etTunnelCore/Actor/Actor+ErrorState.swift → .../Actor/PacketTunnelActor+ErrorState.swift
diff --git a/...etTunnelCore/Actor/Actor+Extensions.swift → .../Actor/PacketTunnelActor+Extensions.swift b/...etTunnelCore/Actor/Actor+Extensions.swift → .../Actor/PacketTunnelActor+Extensions.swift
diff --git a/...ketTunnelCore/Actor/Actor+KeyPolicy.swift → ...e/Actor/PacketTunnelActor+KeyPolicy.swift b/...ketTunnelCore/Actor/Actor+KeyPolicy.swift → ...e/Actor/PacketTunnelActor+KeyPolicy.swift
diff --git a/...ore/Actor/Actor+NetworkReachability.swift → ...cketTunnelActor+NetworkReachability.swift b/...ore/Actor/Actor+NetworkReachability.swift → ...cketTunnelActor+NetworkReachability.swift
diff --git a/...PacketTunnelCore/Actor/Actor+Public.swift → ...Core/Actor/PacketTunnelActor+Public.swift b/...PacketTunnelCore/Actor/Actor+Public.swift → ...Core/Actor/PacketTunnelActor+Public.swift
@@ -1,5 +1,5 @@
 //
-//  Actor+Public.swift
+//  PacketTunnelActor+Public.swift
 //  PacketTunnelCore
 //
 //  Created by pronebird on 27/09/2023.

diff --git a/...etTunnelCore/Actor/Actor+SleepCycle.swift → .../Actor/PacketTunnelActor+SleepCycle.swift b/...etTunnelCore/Actor/Actor+SleepCycle.swift → .../Actor/PacketTunnelActor+SleepCycle.swift
diff --git a/ios/PacketTunnelCore/Actor/Actor.swift → ...tTunnelCore/Actor/PacketTunnelActor.swift b/ios/PacketTunnelCore/Actor/Actor.swift → ...tTunnelCore/Actor/PacketTunnelActor.swift
@@ -1,5 +1,5 @@
 //
-//  Actor.swift
+//  PacketTunnelActor.swift
 //  PacketTunnel
 //
 //  Created by pronebird on 30/06/2023.

diff --git a/ios/PacketTunnelCore/Actor/State.swift b/ios/PacketTunnelCore/Actor/State.swift
@@ -55,7 +55,11 @@ import class WireGuardKitTypes.PrivateKey
  `.connecting`, `.reconnecting`, `.error` can be interrupted if the tunnel is requested to stop, which should segue actor towards `.disconnected` state.
 
  */
-public enum State {
+public enum State: Equatable {
+    public static func == (lhs: State, rhs: State) -> Bool {
+        lhs.name == rhs.name
+    }
+
     /// Initial state at the time when actor is initialized but before the first connection attempt.
     case initial
 

diff --git a/ios/PacketTunnelCoreTests/ActorTests.swift b/ios/PacketTunnelCoreTests/ActorTests.swift
diff --git a/ios/PacketTunnelCoreTests/Mocks/DefaultPathObserverFake.swift b/ios/PacketTunnelCoreTests/Mocks/DefaultPathObserverFake.swift
@@ -23,7 +23,7 @@ class DefaultPathObserverFake: DefaultPathObserverProtocol {
     private var innerPath: NetworkPath = NetworkPathStub()
     private var stateLock = NSLock()
 
-    private var defaultPathHandler: ((NetworkPath) -> Void)?
+    var defaultPathHandler: ((NetworkPath) -> Void)?
 
     func start(_ body: @escaping (NetworkPath) -> Void) {
         stateLock.withLock {