diff options
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt index 70b2ca2d0a..2c8493de8a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCity.kt @@ -16,7 +16,7 @@ class RelayCity( get() = relays.any { relay -> relay.active } override val hasChildren - get() = relays.size > 1 + get() = !relays.isEmpty() override val visibleChildCount: Int get() { @@ -53,6 +53,4 @@ class RelayCity( return 1 } } - - fun getRelayCount(): Int = relays.size } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt index f5d5a867c3..197387d1c2 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayCountry.kt @@ -15,7 +15,7 @@ class RelayCountry( get() = cities.any { city -> city.active } override val hasChildren - get() = getRelayCount() > 1 + get() = !cities.isEmpty() override val visibleChildCount: Int get() { @@ -50,6 +50,4 @@ class RelayCountry( return GetItemResult.Count(itemCount) } - - fun getRelayCount(): Int = cities.map { city -> city.getRelayCount() }.sum() } |
