Merge branch 'display-inactive-servers-in-location-list-ios-1291'

pinkisemils · pinkisemils · commit 5470762f1533 · 2026-02-10T13:09:52.000+01:00
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md
@@ -25,6 +25,7 @@ Line wrap the file at 100 chars.                                              Th
 ### Add
 - Add support for additional languages.
 - Add recent connections in the Select location view.
+- Show disabled servers in location view.
 
 ### Changed
 - Improve reliability of the bridge API connection method.
diff --git a/ios/MullvadREST/Relay/RelaySelector+Wireguard.swift b/ios/MullvadREST/Relay/RelaySelector+Wireguard.swift
@@ -17,7 +17,8 @@ extension RelaySelector {
             by relayConstraint: RelayConstraint<UserSelectedRelays>,
             in relays: REST.ServerRelaysResponse,
             filterConstraint: RelayConstraint<RelayFilter>,
-            daitaEnabled: Bool
+            daitaEnabled: Bool,
+            includeInactive: Bool = false
         ) throws -> [RelayWithLocation<REST.ServerRelay>] {
             let mappedRelays = RelayWithLocation.locateRelays(
                 relays: relays.wireguard.relays,
@@ -28,7 +29,8 @@ extension RelaySelector {
                 relayConstraint,
                 filterConstraint: filterConstraint,
                 daitaEnabled: daitaEnabled,
-                relays: mappedRelays
+                relays: mappedRelays,
+                includeInactive: includeInactive
             )
         }
 
diff --git a/ios/MullvadREST/Relay/RelaySelector.swift b/ios/MullvadREST/Relay/RelaySelector.swift
@@ -68,10 +68,11 @@ public enum RelaySelector {
         _ relayConstraint: RelayConstraint<UserSelectedRelays>,
         filterConstraint: RelayConstraint<RelayFilter>,
         daitaEnabled: Bool,
-        relays: [RelayWithLocation<T>]
+        relays: [RelayWithLocation<T>],
+        includeInactive: Bool = false
     ) throws -> [RelayWithLocation<T>] {
         // Filter on various settings and constraints.
-        var filteredRelays = try filterByActive(relays: relays)
+        var filteredRelays = includeInactive ? relays : try filterByActive(relays: relays)
         filteredRelays = try filterByFilterConstraint(relays: filteredRelays, constraint: filterConstraint)
         filteredRelays = try filterByLocationConstraint(relays: filteredRelays, constraint: relayConstraint)
         filteredRelays = try filterByDaita(relays: filteredRelays, daitaEnabled: daitaEnabled)
diff --git a/ios/MullvadREST/Relay/RelaySelectorWrapper.swift b/ios/MullvadREST/Relay/RelaySelectorWrapper.swift
@@ -47,6 +47,8 @@ public final class RelaySelectorWrapper: RelaySelectorProtocol, Sendable {
         }
     }
 
+    /// This function is expected to be used by the UI to list all available servers, even the inactive ones.
+    /// For the purposes of creating a relay connection, we should use `selectRelays` instead.
     public func findCandidates(tunnelSettings: LatestTunnelSettings) throws -> RelayCandidates {
         let relays = try relayCache.read().relays
 
@@ -64,7 +66,8 @@ public final class RelaySelectorWrapper: RelaySelectorProtocol, Sendable {
                         by: .any,
                         in: relays,
                         filterConstraint: tunnelSettings.relayConstraints.filter,
-                        daitaEnabled: daitaEnabled
+                        daitaEnabled: daitaEnabled,
+                        includeInactive: true
                     )
                 }
 
diff --git a/ios/MullvadVPN/View controllers/SelectLocation/Views/LocationListItem.swift b/ios/MullvadVPN/View controllers/SelectLocation/Views/LocationListItem.swift
@@ -65,12 +65,15 @@ struct LocationListItem<ContextMenu>: View where ContextMenu: View {
                     }
                 } label: {
                     HStack {
-                        if !location.isActive {
-                            Image.mullvadRedDot
-                        } else if location.isSelected {
-                            Image.mullvadIconTick
-                                .foregroundStyle(Color.mullvadSuccessColor)
+                        Group {
+                            if !location.isActive {
+                                Image.mullvadRedDot
+                            } else if location.isSelected {
+                                Image.mullvadIconTick
+                                    .foregroundStyle(Color.mullvadSuccessColor)
+                            }
                         }
+                        .frame(width: 24, height: 24)
                         Text(location.name)
                             .foregroundStyle(
                                 location.isActive && !location.isExcluded
diff --git a/ios/MullvadVPN/View controllers/SelectLocation/Views/RelayItemView.swift b/ios/MullvadVPN/View controllers/SelectLocation/Views/RelayItemView.swift
@@ -57,7 +57,8 @@ struct RelayItemView: View {
                 Spacer()
             }
             .padding(.vertical, subtitle != nil ? 8 : 16)
-            .padding(.horizontal, CGFloat(16 * (level + 1)))
+            .padding(.leading, CGFloat(16 * level + 8))
+            .padding(.trailing, 16)
             .background {
                 Color.colorForLevel(level)
             }
@@ -78,12 +79,15 @@ struct RelayItemView: View {
 
     @ViewBuilder
     func locationStatusIndicator() -> some View {
-        if !location.isActive {
-            Image.mullvadRedDot
-        } else if location.isSelected {
-            Image.mullvadIconTick
-                .foregroundStyle(Color.mullvadSuccessColor)
+        Group {
+            if !location.isActive {
+                Image.mullvadRedDot
+            } else if location.isSelected {
+                Image.mullvadIconTick
+                    .foregroundStyle(Color.mullvadSuccessColor)
+            }
         }
+        .frame(width: 24, height: 24)
     }
 }
 
diff --git a/ios/MullvadVPNTests/MullvadREST/Relay/RelaySelectorTests.swift b/ios/MullvadVPNTests/MullvadREST/Relay/RelaySelectorTests.swift
@@ -250,6 +250,43 @@ class RelaySelectorTests: XCTestCase {
             XCTAssertEqual(error?.reason, .noActiveRelaysFound)
         }
     }
+
+    func testInactiveRelaysExcludedByDefault() throws {
+        let candidates = try RelaySelector.WireGuard.findCandidates(
+            by: .any,
+            in: sampleRelays,
+            filterConstraint: .any,
+            daitaEnabled: false
+        )
+
+        XCTAssertFalse(candidates.contains { $0.relay.hostname == "us-nyc-wg-302" })
+    }
+
+    func testInactiveRelaysIncludedWhenRequested() throws {
+        let candidates = try RelaySelector.WireGuard.findCandidates(
+            by: .any,
+            in: sampleRelays,
+            filterConstraint: .any,
+            daitaEnabled: false,
+            includeInactive: true
+        )
+
+        XCTAssertTrue(candidates.contains { $0.relay.hostname == "us-nyc-wg-302" })
+        XCTAssertFalse(candidates.first { $0.relay.hostname == "us-nyc-wg-302" }!.relay.active)
+    }
+
+    func testInactiveRelaysIncludedInAllInactiveSet() throws {
+        let candidates = try RelaySelector.WireGuard.findCandidates(
+            by: .any,
+            in: sampleRelaysNoActive,
+            filterConstraint: .any,
+            daitaEnabled: false,
+            includeInactive: true
+        )
+
+        XCTAssertEqual(candidates.count, 1)
+        XCTAssertFalse(candidates[0].relay.active)
+    }
 }
 
 extension RelaySelectorTests {

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ public final class RelaySelectorWrapper: RelaySelectorProtocol, Sendable {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
	`50`	`+ /// This function is expected to be used by the UI to list all available servers, even the inactive ones.`
	`51`	+ /// For the purposes of creating a relay connection, we should use `selectRelays` instead.
`50`	`52`	`public func findCandidates(tunnelSettings: LatestTunnelSettings) throws -> RelayCandidates {`
`51`	`53`	`let relays = try relayCache.read().relays`
`52`	`54`
`@@ -64,7 +66,8 @@ public final class RelaySelectorWrapper: RelaySelectorProtocol, Sendable {`
`64`	`66`	`by: .any,`
`65`	`67`	`in: relays,`
`66`	`68`	`filterConstraint: tunnelSettings.relayConstraints.filter,`
`67`		`- daitaEnabled: daitaEnabled`
	`69`	`+ daitaEnabled: daitaEnabled,`
	`70`	`+ includeInactive: true`
`68`	`71`	`)`
`69`	`72`	`}`
`70`	`73`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,8 @@ struct RelayItemView: View {`
`57`	`57`	`Spacer()`
`58`	`58`	`}`
`59`	`59`	`.padding(.vertical, subtitle != nil ? 8 : 16)`
`60`		`- .padding(.horizontal, CGFloat(16 * (level + 1)))`
	`60`	`+ .padding(.leading, CGFloat(16 * level + 8))`
	`61`	`+ .padding(.trailing, 16)`
`61`	`62`	`.background {`
`62`	`63`	`Color.colorForLevel(level)`
`63`	`64`	`}`
`@@ -78,12 +79,15 @@ struct RelayItemView: View {`
`78`	`79`
`79`	`80`	`@ViewBuilder`
`80`	`81`	`func locationStatusIndicator() -> some View {`
`81`		`- if !location.isActive {`
`82`		`- Image.mullvadRedDot`
`83`		`- } else if location.isSelected {`
`84`		`- Image.mullvadIconTick`
`85`		`- .foregroundStyle(Color.mullvadSuccessColor)`
	`82`	`+ Group {`
	`83`	`+ if !location.isActive {`
	`84`	`+ Image.mullvadRedDot`
	`85`	`+ } else if location.isSelected {`
	`86`	`+ Image.mullvadIconTick`
	`87`	`+ .foregroundStyle(Color.mullvadSuccessColor)`
	`88`	`+ }`
`86`	`89`	`}`
	`90`	`+ .frame(width: 24, height: 24)`
`87`	`91`	`}`
`88`	`92`	`}`
`89`	`93`