diff options
| author | Andrew Bulhak <andrew.bulhak@mullvad.net> | 2025-01-21 17:22:32 +0100 |
|---|---|---|
| committer | Andrew Bulhak <andrew.bulhak@mullvad.net> | 2025-01-21 17:27:06 +0100 |
| commit | d351c025551c5c237d15c3595afa0a9e67521e4b (patch) | |
| tree | 705e6bc635284b3dcc17fecd82448e0516a3e2a4 | |
| parent | 78e3d00ac98e167c674b1d447f9df182e1b7d69b (diff) | |
| download | mullvadvpn-IOS-995-show-exit-constraints-in-connect-view.tar.xz mullvadvpn-IOS-995-show-exit-constraints-in-connect-view.zip | |
Merge changes into mainline TunnelViewControllerIOS-995-show-exit-constraints-in-connect-view
| -rw-r--r-- | ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift index 1ed904fa70..5b03a52bb7 100644 --- a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift +++ b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift @@ -9,6 +9,7 @@ import Combine import MapKit import MullvadLogging +import MullvadREST import MullvadSettings import MullvadTypes import SwiftUI @@ -60,7 +61,12 @@ class TunnelViewController: UIViewController, RootContainment { self.interactor = interactor tunnelState = interactor.tunnelStatus.state - connectionViewViewModel = ConnectionViewViewModel(tunnelStatus: interactor.tunnelStatus) + connectionViewViewModel = ConnectionViewViewModel( + tunnelStatus: interactor.tunnelStatus, + relayConstraints: interactor.tunnelSettings.relayConstraints, + relayCache: RelayCache(cacheDirectory: ApplicationConfiguration.containerURL), + customListRepository: CustomListRepository() + ) indicatorsViewViewModel = FeatureIndicatorsViewModel( tunnelSettings: interactor.tunnelSettings, ipOverrides: interactor.ipOverrides @@ -104,6 +110,7 @@ class TunnelViewController: UIViewController, RootContainment { interactor.didUpdateTunnelSettings = { [weak self] tunnelSettings in self?.indicatorsViewViewModel.tunnelSettings = tunnelSettings + self?.connectionViewViewModel.relayConstraints = tunnelSettings.relayConstraints } interactor.didUpdateIpOverrides = { [weak self] overrides in |