diff options
Diffstat (limited to 'android/src/main')
3 files changed, 10 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt index 7e2f09e289..863dc69d8e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt @@ -5,7 +5,8 @@ import net.mullvad.mullvadvpn.model.LocationConstraint data class Relay( val countryCode: String, val cityCode: String, - override val name: String + override val name: String, + val cityName: String ) : RelayItem { override val code = name override val type = RelayItemType.Relay @@ -14,6 +15,8 @@ data class Relay( override val visibleChildCount = 0 + override val locationName = "$cityName ($name)" + override var expanded get() = false set(value) {} diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt index 22f39cbf7e..d55378fbd4 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItem.kt @@ -13,5 +13,8 @@ interface RelayItem { val visibleItemCount: Int get() = visibleChildCount + 1 + val locationName: String + get() = name + var expanded: Boolean } 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 e6bd7728b0..7c3870c4dd 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayList.kt @@ -13,7 +13,9 @@ class RelayList { .map { city -> val relays = city.relays .filter { relay -> relay.hasWireguardTunnels } - .map { relay -> Relay(country.code, city.code, relay.hostname) } + .map { relay -> + Relay(country.code, city.code, relay.hostname, city.name) + } RelayCity(city.name, country.code, city.code, false, relays) } |