Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Multihop feature chip appear if settings or current state say so #7815

Merged
merged 1 commit into from
Mar 17, 2025
+7 −2
Merged

Make Multihop feature chip appear if settings or current state say so #7815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ios/MullvadVPN/TunnelManager/TunnelState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ enum TunnelState: Equatable, CustomStringConvertible, Sendable {
nil
}
}

var isMultihop: Bool {
relays?.entry != nil
}
}

/// A enum that describes the action to perform after disconnect.
Expand Down
3 changes: 2 additions & 1 deletion ios/MullvadVPN/View controllers/Tunnel/ConnectionView/ChipView/ChipFeature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ struct QuantumResistanceFeature: ChipFeature {

struct MultihopFeature: ChipFeature {
let settings: LatestTunnelSettings
let state: TunnelState
var isEnabled: Bool {
settings.tunnelMultihopState.isEnabled
settings.tunnelMultihopState.isEnabled || state.isMultihop
}

var name: String {
Expand Down
2 changes: 1 addition & 1 deletion ios/MullvadVPN/View controllers/Tunnel/ConnectionView/FeatureIndicatorsViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class FeatureIndicatorsViewModel: ChipViewModelProtocol {
let features: [ChipFeature] = [
DaitaFeature(settings: tunnelSettings),
QuantumResistanceFeature(settings: tunnelSettings),
MultihopFeature(settings: tunnelSettings),
MultihopFeature(settings: tunnelSettings, state: tunnelState),
ObfuscationFeature(settings: tunnelSettings),
DNSFeature(settings: tunnelSettings),
IPOverrideFeature(overrides: ipOverrides),
Expand Down
Loading