Make AccessibilityIdentifier.wireGuardPort tagged with its value

mullvad · Dec 9, 2024 · b6031ed · b6031ed
1 parent 9aa969b
commit b6031ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/ios/MullvadVPN/Classes/AccessbilityIdentifier.swift b/ios/MullvadVPN/Classes/AccessbilityIdentifier.swift
@@ -181,7 +181,7 @@ public enum AccessibilityIdentifier: Equatable {
     case wireGuardObfuscationOff
     case wireGuardObfuscationUdpOverTcp
     case wireGuardObfuscationShadowsocks
-    case wireGuardPort
+    case wireGuardPort(UInt16?)
     case udpOverTcpObfuscationSettings
 
     // Custom DNS

diff --git a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsCellFactory.swift
@@ -80,8 +80,7 @@ final class VPNSettingsCellFactory: CellFactoryProtocol {
             }
 
             cell.titleLabel.text = portString
-            // TODO: replace this with a tagged AccessibilityIdentifier
-            cell.accessibilityIdentifier = "\(item.accessibilityIdentifier.asString) (\(portString))"
+            cell.accessibilityIdentifier = "\(item.accessibilityIdentifier.asString)"
             cell.applySubCellStyling()
 
         case .wireGuardCustomPort:

diff --git a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift
@@ -112,8 +112,8 @@ final class VPNSettingsDataSource: UITableViewDiffableDataSource<
                 return .dnsSettings
             case .ipOverrides:
                 return .ipOverrides
-            case .wireGuardPort:
-                return .wireGuardPort
+            case let .wireGuardPort(port):
+                return .wireGuardPort(port)
             case .wireGuardCustomPort:
                 return .wireGuardCustomPort
             case .wireGuardObfuscationAutomatic: