-
Notifications
You must be signed in to change notification settings - Fork 356
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add the DAITA page to the root of the settings page
- Loading branch information
Showing
31 changed files
with
729 additions
and
497 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 0 additions & 33 deletions
33
ios/MullvadVPN/Coordinators/Settings/DAITA/DAITATunnelSettingsObserver.swift
This file was deleted.
Oops, something went wrong.
97 changes: 90 additions & 7 deletions
97
ios/MullvadVPN/Coordinators/Settings/DAITA/DAITATunnelSettingsViewModel.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,107 @@ | ||
| // | ||
| // DAITATunnelSettingsObservable.swift | ||
| // DAITATunnelSettingsViewModel.swift | ||
| // MullvadVPN | ||
| // | ||
| // Created by Jon Petersson on 2024-11-21. | ||
| // Copyright © 2024 Mullvad VPN AB. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import MullvadREST | ||
| import MullvadSettings | ||
|
|
||
| protocol DAITATunnelSettingsObservable: ObservableObject { | ||
| var value: DAITASettings { get set } | ||
| class DAITATunnelSettingsViewModel: TunnelSettingsObserver, ObservableObject { | ||
| typealias TunnelSetting = DAITASettings | ||
|
|
||
| let tunnelManager: TunnelManager | ||
| var tunnelObserver: TunnelObserver? | ||
|
|
||
| var didFailDAITAValidation: (((item: DAITASettingsPromptItem, setting: DAITASettings)) -> Void)? | ||
|
|
||
| var value: DAITASettings { | ||
| willSet { | ||
| guard newValue != value else { return } | ||
|
|
||
| objectWillChange.send() | ||
| tunnelManager.updateSettings([.daita(newValue)]) | ||
| } | ||
| } | ||
|
|
||
| required init(tunnelManager: TunnelManager) { | ||
| self.tunnelManager = tunnelManager | ||
| value = tunnelManager.settings.daita | ||
|
|
||
| tunnelObserver = TunnelBlockObserver(didUpdateTunnelSettings: { [weak self] _, newSettings in | ||
| self?.value = newSettings.daita | ||
| }) | ||
| } | ||
|
|
||
| func evaluate(setting: DAITASettings) { | ||
| if let error = evaluateDaitaSettingsCompatibility(setting) { | ||
| let promptItem = promptItem(from: error, setting: setting) | ||
|
|
||
| didFailDAITAValidation?((item: promptItem, setting: setting)) | ||
| return | ||
| } | ||
|
|
||
| value = setting | ||
| } | ||
| } | ||
|
|
||
| extension DAITATunnelSettingsViewModel { | ||
| private func promptItem( | ||
| from error: DAITASettingsCompatibilityError, | ||
| setting: DAITASettings | ||
| ) -> DAITASettingsPromptItem { | ||
| let promptItemSetting: DAITASettingsPromptItem.Setting = if setting.daitaState != value.daitaState { | ||
| .daita | ||
| } else { | ||
| .directOnly | ||
| } | ||
|
|
||
| var promptItem: DAITASettingsPromptItem | ||
|
|
||
| switch error { | ||
| case .singlehop: | ||
| promptItem = .daitaSettingIncompatibleWithSinglehop(promptItemSetting) | ||
| case .multihop: | ||
| promptItem = .daitaSettingIncompatibleWithMultihop(promptItemSetting) | ||
| } | ||
|
|
||
| return promptItem | ||
| } | ||
|
|
||
| private func evaluateDaitaSettingsCompatibility(_ settings: DAITASettings) -> DAITASettingsCompatibilityError? { | ||
| guard settings.daitaState.isEnabled else { return nil } | ||
|
|
||
| var tunnelSettings = tunnelManager.settings | ||
| tunnelSettings.daita = settings | ||
|
|
||
| var compatibilityError: DAITASettingsCompatibilityError? | ||
|
|
||
| do { | ||
| _ = try tunnelManager.selectRelays(tunnelSettings: tunnelSettings) | ||
| } catch let error as NoRelaysSatisfyingConstraintsError where error.reason == .noDaitaRelaysFound { | ||
| // Return error if no relays could be selected due to DAITA constraints. | ||
| compatibilityError = tunnelSettings.tunnelMultihopState.isEnabled ? .multihop : .singlehop | ||
| } catch _ as NoRelaysSatisfyingConstraintsError { | ||
| // Even if the constraints error is not DAITA specific, if both DAITA and Direct only are enabled, | ||
| // we should return a DAITA related error since the current settings would have resulted in the | ||
| // relay selector not being able to select a DAITA relay anyway. | ||
| if settings.isDirectOnly { | ||
| compatibilityError = tunnelSettings.tunnelMultihopState.isEnabled ? .multihop : .singlehop | ||
| } | ||
| } catch {} | ||
|
|
||
| return compatibilityError | ||
| } | ||
| } | ||
|
|
||
| class MockDAITATunnelSettingsViewModel: DAITATunnelSettingsObservable { | ||
| class MockDAITATunnelSettingsViewModel: TunnelSettingsObservable { | ||
| @Published var value: DAITASettings | ||
|
|
||
| init(daitaSettings: DAITASettings = DAITASettings()) { | ||
| value = daitaSettings | ||
| } | ||
| } | ||
|
|
||
| class DAITATunnelSettingsViewModel: DAITATunnelSettingsObserver, DAITATunnelSettingsObservable {} | ||
| func evaluate(setting: MullvadSettings.DAITASettings) {} | ||
| } |
Oops, something went wrong.