summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--ios/MullvadSettings/TunnelSettingsV6.swift2
-rw-r--r--ios/MullvadVPN/Coordinators/LocationCoordinator.swift6
2 files changed, 5 insertions, 3 deletions
diff --git a/ios/MullvadSettings/TunnelSettingsV6.swift b/ios/MullvadSettings/TunnelSettingsV6.swift
index 3d10b8be0c..4f81d9549d 100644
--- a/ios/MullvadSettings/TunnelSettingsV6.swift
+++ b/ios/MullvadSettings/TunnelSettingsV6.swift
@@ -22,7 +22,7 @@ public struct TunnelSettingsV6: Codable, Equatable, TunnelSettings {
/// Whether Post Quantum exchanges are enabled.
public var tunnelQuantumResistance: TunnelQuantumResistance
- /// Whether Multi-hop is enabled.
+ /// Whether Multihop is enabled.
public var tunnelMultihopState: MultihopState
/// DAITA settings.
diff --git a/ios/MullvadVPN/Coordinators/LocationCoordinator.swift b/ios/MullvadVPN/Coordinators/LocationCoordinator.swift
index 7bf540debc..de38e6c811 100644
--- a/ios/MullvadVPN/Coordinators/LocationCoordinator.swift
+++ b/ios/MullvadVPN/Coordinators/LocationCoordinator.swift
@@ -54,9 +54,11 @@ class LocationCoordinator: Coordinator, Presentable, Presenting {
}
func start() {
- let startContext: LocationViewControllerWrapper.MultihopContext =
- if case .noRelaysSatisfyingDaitaConstraints = tunnelManager.tunnelStatus.observedState
+ var startContext: LocationViewControllerWrapper.MultihopContext = .exit
+ if tunnelManager.settings.tunnelMultihopState.isEnabled {
+ startContext = if case .noRelaysSatisfyingDaitaConstraints = tunnelManager.tunnelStatus.observedState
.blockedState?.reason { .entry } else { .exit }
+ }
let locationViewControllerWrapper = LocationViewControllerWrapper(
customListRepository: customListRepository,