Merge changes into mainline TunnelViewController

mullvad · Jan 21, 2025 · d351c02 · d351c02
1 parent 78e3d00
commit d351c02
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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