clean up

Author: Rawa

android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/RelayListRepository.kt

@@ -42,17 +42,17 @@ class RelayListRepository(
     private fun List<RelayItem.Location.Country>.translateRelay(
         translations: Map<String, String>
     ): List<RelayItem.Location.Country> {
-        return if (translations.isEmpty()) {
+        if (translations.isEmpty()) {
             return this
-        } else {
-            Every.list<RelayItem.Location.Country>().modify(this) {
-                it.copy<RelayItem.Location.Country> {
-                    RelayItem.Location.Country.name set translations.getOrDefault(it.name, it.name)
-                    RelayItem.Location.Country.cities.every(Every.list()).name transform
-                        { cityName ->
-                            translations.getOrDefault(cityName, cityName)
-                        }
-                }
+        }
+
+        return Every.list<RelayItem.Location.Country>().modify(this) {
+            it.copy<RelayItem.Location.Country> {
+                RelayItem.Location.Country.name set translations.getOrDefault(it.name, it.name)
+                RelayItem.Location.Country.cities.every(Every.list()).name transform
+                    { cityName ->
+                        translations.getOrDefault(cityName, cityName)
+                    }
             }
         }
     }

android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/TunnelState.kt

@@ -1,7 +1,7 @@
 package net.mullvad.mullvadvpn.lib.model
 
 sealed class TunnelState {
-    data class Disconnected(val location: GeoIpLocation? = null, val age: Int = 0) : TunnelState()
+    data class Disconnected(val location: GeoIpLocation? = null) : TunnelState()
 
     data class Connecting(val endpoint: TunnelEndpoint?, val location: GeoIpLocation?) :
         TunnelState()

android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/RelayLocationTranslationRepository.kt

@@ -13,6 +13,7 @@ import kotlin.to
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
@@ -24,14 +25,13 @@ typealias Translations = Map<String, String>
 class RelayLocationTranslationRepository(
     val context: Context,
     val localeRepository: LocaleRepository,
-    externalScpoe: CoroutineScope,
+    externalScope: CoroutineScope = MainScope(),
     val dispatcher: CoroutineDispatcher = Dispatchers.IO
 ) {
-
     val translations: StateFlow<Translations> =
         localeRepository.currentLocale
             .map { loadTranslations(it) }
-            .stateIn(externalScpoe, SharingStarted.Eagerly, emptyMap())
+            .stateIn(externalScope, SharingStarted.Eagerly, emptyMap())
 
     private val defaultTranslation: Map<String, String>