diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-12 21:33:00 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-25 18:19:59 +0000 |
| commit | 04be7025554d441490a751eb3cdb042f8f270585 (patch) | |
| tree | bf1687a8cf6e4588d278fe783dc5292f25698fac /android/src/main | |
| parent | f4ad9fd268f1bfbab376d8675a162288e1c18449 (diff) | |
| download | mullvadvpn-04be7025554d441490a751eb3cdb042f8f270585.tar.xz mullvadvpn-04be7025554d441490a751eb3cdb042f8f270585.zip | |
Don't change `LocationInfoCache` from UI
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt | 31 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt | 1 |
2 files changed, 0 insertions, 32 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt index 04a99859a1..e8136ce5ed 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt @@ -14,10 +14,6 @@ import net.mullvad.mullvadvpn.model.Constraint import net.mullvad.mullvadvpn.model.GeoIpLocation import net.mullvad.mullvadvpn.model.RelaySettings import net.mullvad.mullvadvpn.model.TunnelState -import net.mullvad.mullvadvpn.relaylist.Relay -import net.mullvad.mullvadvpn.relaylist.RelayCity -import net.mullvad.mullvadvpn.relaylist.RelayCountry -import net.mullvad.mullvadvpn.relaylist.RelayItem import net.mullvad.mullvadvpn.service.endpoint.SettingsListener import net.mullvad.mullvadvpn.util.ExponentialBackoff import net.mullvad.mullvadvpn.util.Intermittent @@ -76,12 +72,6 @@ class LocationInfoCache( state = newState } - var selectedRelay by observable<RelayItem?>(null) { _, oldRelay, newRelay -> - if (newRelay != oldRelay) { - updateSelectedRelayLocation(newRelay) - } - } - init { connectivityListener.connectivityNotifier.subscribe(this) { isConnected -> if (isConnected && state is TunnelState.Disconnected) { @@ -102,27 +92,6 @@ class LocationInfoCache( onNewLocation = null } - private fun updateSelectedRelayLocation(relayItem: RelayItem?) { - selectedRelayLocation = when (relayItem) { - is RelayCountry -> GeoIpLocation(null, null, relayItem.name, null, null) - is RelayCity -> GeoIpLocation( - null, - null, - relayItem.country.name, - relayItem.name, - null - ) - is Relay -> GeoIpLocation( - null, - null, - relayItem.city.country.name, - relayItem.city.name, - relayItem.name - ) - else -> null - } - } - private fun runFetcher() = GlobalScope.actor<RequestFetch>( Dispatchers.Default, Channel.CONFLATED diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt index 755a6c5fea..9c8e797945 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt @@ -91,7 +91,6 @@ class ConnectFragment : relayListListener.onRelayListChange = { _, selectedRelayItem -> jobTracker.newUiJob("updateSelectedRelayItem") { - locationInfoCache.selectedRelay = selectedRelayItem switchLocationButton.location = selectedRelayItem } } |