summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrew Bulhak <andrew.bulhak@mullvad.net>2025-04-11 15:55:01 +0200
committerJon Petersson <jon.petersson@mullvad.net>2025-04-16 15:10:26 +0200
commitd6f8d577dcdd1611e8b6b0b06e22e14cc08d711d (patch)
treed17e7973ecab8b23220aab74308e86611c3cb48a
parent9f81ce7ff35a374343879a9a419f20c576f37657 (diff)
downloadmullvadvpn-d6f8d577dcdd1611e8b6b0b06e22e14cc08d711d.tar.xz
mullvadvpn-d6f8d577dcdd1611e8b6b0b06e22e14cc08d711d.zip
Decouple Multihop feature indicator from settings
-rw-r--r--ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ChipView/ChipFeature.swift3
-rw-r--r--ios/MullvadVPN/View controllers/Tunnel/ConnectionView/FeatureIndicatorsViewModel.swift2
2 files changed, 2 insertions, 3 deletions
diff --git a/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ChipView/ChipFeature.swift b/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ChipView/ChipFeature.swift
index 64d5d0b77f..e986476def 100644
--- a/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ChipView/ChipFeature.swift
+++ b/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ChipView/ChipFeature.swift
@@ -53,10 +53,9 @@ struct QuantumResistanceFeature: ChipFeature {
}
struct MultihopFeature: ChipFeature {
- let settings: LatestTunnelSettings
let state: TunnelState
var isEnabled: Bool {
- settings.tunnelMultihopState.isEnabled || state.isMultihop
+ state.isMultihop
}
var name: String {
diff --git a/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/FeatureIndicatorsViewModel.swift b/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/FeatureIndicatorsViewModel.swift
index efd49fb9a7..2a4e521919 100644
--- a/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/FeatureIndicatorsViewModel.swift
+++ b/ios/MullvadVPN/View controllers/Tunnel/ConnectionView/FeatureIndicatorsViewModel.swift
@@ -36,7 +36,7 @@ class FeatureIndicatorsViewModel: ChipViewModelProtocol {
let features: [ChipFeature] = [
DaitaFeature(state: tunnelState),
QuantumResistanceFeature(state: tunnelState),
- MultihopFeature(settings: tunnelSettings, state: tunnelState),
+ MultihopFeature(state: tunnelState),
ObfuscationFeature(settings: tunnelSettings, state: observedState),
DNSFeature(settings: tunnelSettings),
IPOverrideFeature(overrides: ipOverrides),