diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-30 19:42:43 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-14 11:52:38 +0000 |
| commit | b2ebd898135209517de65d70f102c6f849726066 (patch) | |
| tree | 62a726d300c03c0ac4d9002e96638bdd0b5c9891 | |
| parent | 388658e17bb4a932d09b7eca53eb5d5bd3f9cde8 (diff) | |
| download | mullvadvpn-b2ebd898135209517de65d70f102c6f849726066.tar.xz mullvadvpn-b2ebd898135209517de65d70f102c6f849726066.zip | |
Filter out OpenVPN relays and locations
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt index 809fa1265f..e6bd7728b0 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt @@ -7,17 +7,21 @@ class RelayList { val countries: List<RelayCountry> constructor(model: net.mullvad.mullvadvpn.model.RelayList) { - countries = model.countries.map { country -> - val cities = country.cities.map { city -> - val relays = city.relays.map { relay -> - Relay(country.code, city.code, relay.hostname) - } + countries = model.countries + .map { country -> + val cities = country.cities + .map { city -> + val relays = city.relays + .filter { relay -> relay.hasWireguardTunnels } + .map { relay -> Relay(country.code, city.code, relay.hostname) } - RelayCity(city.name, country.code, city.code, false, relays) - } + RelayCity(city.name, country.code, city.code, false, relays) + } + .filter { city -> city.relays.isNotEmpty() } - RelayCountry(country.name, country.code, false, cities) - } + RelayCountry(country.name, country.code, false, cities) + } + .filter { country -> country.cities.isNotEmpty() } } fun findItemForLocation( |