Fix multiple Wireguard port selection in settings view

mullvad · Dec 3, 2024 · 6afd27f · 6afd27f
1 parent 8bda210
commit 6afd27f
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift
@@ -186,9 +186,12 @@ final class VPNSettingsDataSource: UITableViewDiffableDataSource<
     weak var delegate: VPNSettingsDataSourceDelegate?
 
     var selectedIndexPaths: [IndexPath] {
-        let wireGuardPortItem: Item = viewModel.customWireGuardPort == nil
-            ? .wireGuardPort(viewModel.wireGuardPort)
-            : .wireGuardCustomPort
+        var wireGuardPortItem: Item = .wireGuardPort(viewModel.wireGuardPort)
+        if let customPort = indexPath(for: .wireGuardCustomPort) {
+            if tableView?.indexPathsForSelectedRows?.contains(customPort) ?? false {
+                wireGuardPortItem = .wireGuardCustomPort
+            }
+        }
 
         let obfuscationStateItem: Item = switch viewModel.obfuscationState {
         case .automatic: .wireGuardObfuscationAutomatic
@@ -253,6 +256,9 @@ final class VPNSettingsDataSource: UITableViewDiffableDataSource<
 
             Item.wireGuardPorts.forEach { item in
                 if case let .wireGuardPort(port) = item, port == viewModel.wireGuardPort {
+                    if let indexPath = indexPath(for: item) {
+                        deselectAllRowsInSectionExceptRowAt(indexPath)
+                    }
                     selectRow(at: item)
                     return
                 }