Merge branch 'no-relays-when-in-blocked-state-triggered-by-daita-and-…

…ios-864'
mullvad · Oct 10, 2024 · 368961a · 368961a
2 parents 9f187b1 + 30787e6
commit 368961a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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,