diff options
| author | Andrew Bulhak <andrew.bulhak@mullvad.net> | 2024-04-04 14:13:52 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-04-08 13:22:40 +0200 |
| commit | f563dcbc85d2338e81fa3f739b533271f20ffa11 (patch) | |
| tree | 3811dac3a0266794d449830c7f3b5528827088aa | |
| parent | 8242e289256afd142c21cdc2e5fca6aad5749d90 (diff) | |
| download | mullvadvpn-f563dcbc85d2338e81fa3f739b533271f20ffa11.tar.xz mullvadvpn-f563dcbc85d2338e81fa3f739b533271f20ffa11.zip | |
Rename StatePriorToBlockedState to State.BlockingData.PriorState
| -rw-r--r-- | ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift | 2 | ||||
| -rw-r--r-- | ios/PacketTunnelCore/Actor/State.swift | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift b/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift index 40d0431d1a..b450f44819 100644 --- a/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift +++ b/ios/PacketTunnelCore/Actor/PacketTunnelActor+ErrorState.swift @@ -95,7 +95,7 @@ extension PacketTunnelActor { private func mapConnectionState( _ connState: State.ConnectionData, reason: BlockedStateReason, - priorState: StatePriorToBlockedState + priorState: State.BlockingData.PriorState ) -> State.BlockingData { State.BlockingData( reason: reason, diff --git a/ios/PacketTunnelCore/Actor/State.swift b/ios/PacketTunnelCore/Actor/State.swift index 198ac45c96..6728d4b8a9 100644 --- a/ios/PacketTunnelCore/Actor/State.swift +++ b/ios/PacketTunnelCore/Actor/State.swift @@ -173,7 +173,7 @@ extension State { public var recoveryTask: AutoCancellingTask? /// Prior state of the actor before entering blocked state - public var priorState: StatePriorToBlockedState + public var priorState: PriorState } } @@ -214,9 +214,11 @@ public enum BlockedStateReason: String, Codable, Equatable { case unknown } -/// Legal states that can precede error state. -enum StatePriorToBlockedState: Equatable { - case initial, connecting, connected, reconnecting +extension State.BlockingData { + /// Legal states that can precede error state. + enum PriorState: Equatable { + case initial, connecting, connected, reconnecting + } } /// Target state the actor should transition into upon request to either start (connect) or reconnect. |