Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug where offline servers can be selected #6085

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Fix bug where offline servers can be selected #6085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ios/MullvadVPN/View controllers/SelectLocation/AllLocationDataSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class AllLocationDataSource: LocationDataSourceProtocol {
name: serverLocation.country,
code: LocationNode.combineNodeCodes([countryCode]),
locations: [location],
isActive: relay.active
isActive: true // Defaults to true, updated when children are populated.
)

if !rootNode.children.contains(countryNode) {
Expand All @@ -77,7 +77,7 @@ class AllLocationDataSource: LocationDataSourceProtocol {
name: serverLocation.city,
code: LocationNode.combineNodeCodes([countryCode, cityCode]),
locations: [location],
isActive: relay.active
isActive: true // Defaults to true, updated when children are populated.
)

if let countryNode = rootNode.countryFor(code: countryCode),
Expand All @@ -101,6 +101,14 @@ class AllLocationDataSource: LocationDataSourceProtocol {
hostNode.parent = cityNode
cityNode.children.append(hostNode)
cityNode.children.sort()

cityNode.isActive = cityNode.children.contains(where: { hostNode in
hostNode.isActive
})

countryNode.isActive = countryNode.children.contains(where: { cityNode in
cityNode.isActive
})
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions ios/MullvadVPN/View controllers/SelectLocation/LocationDataSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ extension LocationDataSource: UITableViewDelegate {
}
}

func tableView(_ tableView: UITableView, shouldHighlightRowAt indexPath: IndexPath) -> Bool {
itemIdentifier(for: indexPath)?.node.isActive ?? false
}

func tableView(_ tableView: UITableView, indentationLevelForRowAt indexPath: IndexPath) -> Int {
itemIdentifier(for: indexPath)?.indentationLevel ?? 0
}
Expand Down
Loading