diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-02 22:23:45 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-25 18:19:59 +0000 |
| commit | a7b4851f2d41796124d4ce6dff403720f2b90d92 (patch) | |
| tree | d4961def84f4e8ea698f5fb448064eff2de67b4a | |
| parent | 7c9c421421804e6b7b1034f12272b741f75f1ed4 (diff) | |
| download | mullvadvpn-a7b4851f2d41796124d4ce6dff403720f2b90d92.tar.xz mullvadvpn-a7b4851f2d41796124d4ce6dff403720f2b90d92.zip | |
Use UI-side `LocationInfoCache` in the UI
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt index 3d5d8e8a28..5e5ecba072 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -13,7 +13,7 @@ import net.mullvad.mullvadvpn.service.CustomDns import net.mullvad.mullvadvpn.service.KeyStatusListener import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.service.SplitTunneling -import net.mullvad.mullvadvpn.service.endpoint.LocationInfoCache +import net.mullvad.mullvadvpn.ui.serviceconnection.LocationInfoCache import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnection import net.mullvad.mullvadvpn.ui.serviceconnection.SettingsListener diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt index 9bc22dd069..aa055c47b2 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt @@ -26,7 +26,7 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: val connectionProxy = service.connectionProxy val customDns = service.customDns val keyStatusListener = service.keyStatusListener - val locationInfoCache = service.locationInfoCache + val locationInfoCache = LocationInfoCache(service.locationInfoCache) val settingsListener = SettingsListener(dispatcher) val splitTunneling = service.splitTunneling @@ -42,6 +42,7 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: fun onDestroy() { dispatcher.onDestroy() + locationInfoCache.onDestroy() settingsListener.onDestroy() appVersionInfoCache.onDestroy() |