Fix UI tests and Make connection view releasable

mullvad · Jan 16, 2025 · e004028 · e004028
1 parent f7aef11
commit e004028
Show file tree

Hide file tree

Showing 28 changed files with 187 additions and 1,143 deletions.
diff --git a/ios/MullvadVPN.xcodeproj/project.pbxproj b/ios/MullvadVPN.xcodeproj/project.pbxproj
diff --git a/ios/MullvadVPN/Classes/AccessbilityIdentifier.swift b/ios/MullvadVPN/Classes/AccessbilityIdentifier.swift
@@ -157,6 +157,7 @@ public enum AccessibilityIdentifier: Equatable {
     case connectionPanelInAddressRow
     case connectionPanelOutAddressRow
     case connectionPanelOutIpv6AddressRow
+    case connectionPanelServerLabel
     case customSwitch
     case customWireGuardPortTextField
     case dnsContentBlockersHeaderView

diff --git a/ios/MullvadVPN/Coordinators/TunnelCoordinator.swift b/ios/MullvadVPN/Coordinators/TunnelCoordinator.swift
@@ -12,13 +12,7 @@ import UIKit
 
 class TunnelCoordinator: Coordinator, Presenting {
     private let tunnelManager: TunnelManager
-
-    #if DEBUG
-    private let controller: FI_TunnelViewController
-    #else
     private let controller: TunnelViewController
-    #endif
-
     private var tunnelObserver: TunnelObserver?
 
     var presentationContext: UIViewController {
@@ -44,11 +38,7 @@ class TunnelCoordinator: Coordinator, Presenting {
             ipOverrideRepository: ipOverrideRepository
         )
 
-        #if DEBUG
-        controller = FI_TunnelViewController(interactor: interactor)
-        #else
         controller = TunnelViewController(interactor: interactor)
-        #endif
 
         super.init()
 

diff --git a/...FeatureIndicators/ActivityIndicator.swift → ...ontrollers/Tunnel/ActivityIndicator.swift b/...FeatureIndicators/ActivityIndicator.swift → ...ontrollers/Tunnel/ActivityIndicator.swift
diff --git a/ios/MullvadVPN/View controllers/Tunnel/ConnectionPanelView.swift b/ios/MullvadVPN/View controllers/Tunnel/ConnectionPanelView.swift
diff --git a/...dicators/ConnectionView/ButtonPanel.swift → ...s/Tunnel/ConnectionView/ButtonPanel.swift b/...dicators/ConnectionView/ButtonPanel.swift → ...s/Tunnel/ConnectionView/ButtonPanel.swift
diff --git a/...tionView/ChipView/ChipContainerView.swift → ...tionView/ChipView/ChipContainerView.swift b/...tionView/ChipView/ChipContainerView.swift → ...tionView/ChipView/ChipContainerView.swift
diff --git a/...ConnectionView/ChipView/ChipFeature.swift → ...ConnectionView/ChipView/ChipFeature.swift b/...ConnectionView/ChipView/ChipFeature.swift → ...ConnectionView/ChipView/ChipFeature.swift
diff --git a/...s/ConnectionView/ChipView/ChipModel.swift → ...l/ConnectionView/ChipView/ChipModel.swift b/...s/ConnectionView/ChipView/ChipModel.swift → ...l/ConnectionView/ChipView/ChipModel.swift
diff --git a/...rs/ConnectionView/ChipView/ChipView.swift → ...el/ConnectionView/ChipView/ChipView.swift b/...rs/ConnectionView/ChipView/ChipView.swift → ...el/ConnectionView/ChipView/ChipView.swift
diff --git a/...View/ChipView/ChipViewModelProtocol.swift → ...View/ChipView/ChipViewModelProtocol.swift b/...View/ChipView/ChipViewModelProtocol.swift → ...View/ChipView/ChipViewModelProtocol.swift
diff --git a/...ators/ConnectionView/ConnectionView.swift → ...unnel/ConnectionView/ConnectionView.swift b/...ators/ConnectionView/ConnectionView.swift → ...unnel/ConnectionView/ConnectionView.swift
diff --git a/...View/ConnectionViewComponentPreview.swift → ...View/ConnectionViewComponentPreview.swift b/...View/ConnectionViewComponentPreview.swift → ...View/ConnectionViewComponentPreview.swift
diff --git a/...nectionView/ConnectionViewViewModel.swift → ...nectionView/ConnectionViewViewModel.swift b/...nectionView/ConnectionViewViewModel.swift → ...nectionView/ConnectionViewViewModel.swift
@@ -24,7 +24,7 @@ class ConnectionViewViewModel: ObservableObject {
         case selectLocation
     }
 
-    @Published var tunnelStatus: TunnelStatus
+    @Published private(set) var tunnelStatus: TunnelStatus
     @Published var outgoingConnectionInfo: OutgoingConnectionInfo?
     @Published var showsActivityIndicator = false
 
@@ -46,6 +46,14 @@ class ConnectionViewViewModel: ObservableObject {
     init(tunnelStatus: TunnelStatus) {
         self.tunnelStatus = tunnelStatus
     }
+
+    func update(tunnelStatus: TunnelStatus) {
+        self.tunnelStatus = tunnelStatus
+
+        if !tunnelIsConnected {
+            outgoingConnectionInfo = nil
+        }
+    }
 }
 
 extension ConnectionViewViewModel {

diff --git a/...ors/ConnectionView/DetailsContainer.swift → ...nel/ConnectionView/DetailsContainer.swift b/...ors/ConnectionView/DetailsContainer.swift → ...nel/ConnectionView/DetailsContainer.swift