Merge branch 'country-has-trailing-comma-in-the-connect-screen-when-n…

…o-droid-1503'
mullvad · Nov 20, 2024 · 746b94d · 746b94d
2 parents 634338a + 77c5f84
commit 746b94d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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/...lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt b/...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,