diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-12 10:38:53 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-12 12:57:45 +0000 |
| commit | 2ad2017036b5519db33554231485b5c9f67b0fcc (patch) | |
| tree | aa3c9fc92991f9dac7454b49e6eb338e2bee1064 /android/src | |
| parent | e94e3dce715a8b40c72f30e0151a6cb12dc5971d (diff) | |
| download | mullvadvpn-2ad2017036b5519db33554231485b5c9f67b0fcc.tar.xz mullvadvpn-2ad2017036b5519db33554231485b5c9f67b0fcc.zip | |
Stop location fetch when closing the UI
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt index 10f7dd7bcf..a511156bf3 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/LocationInfoCache.kt @@ -73,6 +73,10 @@ class LocationInfoCache( } } + fun onDestroy() { + activeFetch?.cancel() + } + private fun locationFromSelectedRelay(): GeoIpLocation? { val relayItem = relayListListener.selectedRelayItem diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index 89b33b6869..7660e240bb 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -121,6 +121,7 @@ class MainActivity : FragmentActivity() { accountCache.onDestroy() appVersionInfoCache.onDestroy() keyStatusListener.onDestroy() + locationInfoCache.onDestroy() relayListListener.onDestroy() settingsListener.onDestroy() |