summaryrefslogtreecommitdiffhomepage
path: root/android/app
diff options
context:
space:
mode:
Diffstat (limited to 'android/app')
-rw-r--r--android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt17
1 files changed, 5 insertions, 12 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt
index 21ef30408c..4803b966a9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt
@@ -95,23 +95,16 @@ private fun RelayItem.Location.City.filter(
}
}
-private fun RelayItem.Location.Relay.hasMatchingDaitaSetting(filterDaita: Boolean): Boolean {
- return if (filterDaita) features.daita else true
-}
+private fun RelayItem.Location.Relay.hasMatchingDaitaSetting(filterDaita: Boolean): Boolean =
+ if (filterDaita) daita else true
private fun RelayItem.Location.Relay.filter(
ownership: Constraint<Ownership>,
providers: Constraint<Providers>,
daita: Boolean,
-): RelayItem.Location.Relay? {
- return if (
- hasMatchingDaitaSetting(daita) && hasOwnership(ownership) && hasProvider(providers)
- ) {
- this
- } else {
- null
- }
-}
+): RelayItem.Location.Relay? =
+ if (hasMatchingDaitaSetting(daita) && hasOwnership(ownership) && hasProvider(providers)) this
+ else null
fun List<RelayItem.Location.Country>.findByGeoLocationId(
geoLocationId: GeoLocationId