diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2024-10-10 09:19:53 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2024-10-10 09:19:53 +0200 |
| commit | 368961af1248bb7ead902f2c5861cbbf70df6f76 (patch) | |
| tree | 51c81b6cb7ccf7d6d4a7170f2c61fc2cde5c084e /ios | |
| parent | 9f187b12221147f205f46092e41973e4e4a474aa (diff) | |
| parent | 30787e66620c02b7d999436ea425600efab3f67f (diff) | |
| download | mullvadvpn-368961af1248bb7ead902f2c5861cbbf70df6f76.tar.xz mullvadvpn-368961af1248bb7ead902f2c5861cbbf70df6f76.zip | |
Merge branch 'no-relays-when-in-blocked-state-triggered-by-daita-and-ios-864'
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/MullvadSettings/TunnelSettingsV6.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/Coordinators/LocationCoordinator.swift | 6 |
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, |