diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-11-18 14:56:55 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-11-20 10:26:50 +0100 |
| commit | 77c5f849a374cb19b1c28edfcffc386cecc94464 (patch) | |
| tree | 7c116eb76d2f104716dbd1af0f06ad02f8a8d718 /android | |
| parent | 634338af4a1e3b998659e09de3ec8bce11f9da0a (diff) | |
| download | mullvadvpn-77c5f849a374cb19b1c28edfcffc386cecc94464.tar.xz mullvadvpn-77c5f849a374cb19b1c28edfcffc386cecc94464.zip | |
Fix trailing comma when location has no city
Diffstat (limited to 'android')
2 files changed, 3 insertions, 3 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt index 26a3382a5f..71e7f66d0f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ConnectScreen.kt @@ -431,9 +431,9 @@ private fun GeoIpLocation?.asString(): String { else { buildString { append(country) - city?.let { + if (!city.isNullOrBlank()) { append(", ") - append(it) + append(city) } } } diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt index 9c54bc5bc5..236d4aa19c 100644 --- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt +++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt @@ -134,7 +134,7 @@ internal fun ManagementInterface.GeoIpLocation.toDomain(): GeoIpLocation = null }, country = country, - city = city, + city = if (hasCity()) city else null, latitude = latitude, longitude = longitude, hostname = if (hasHostname()) hostname else null, |