summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-24 23:37:34 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-24 23:51:01 +0000
commite9383947f9bb7ad28da006836c89dcd7d2c259fc (patch)
tree616b216e0c46dc7471a8e6918a7aa4a38e04cc90 /android/src
parent215bf659834d63cd66888f4086c0370dc61994d1 (diff)
downloadmullvadvpn-e9383947f9bb7ad28da006836c89dcd7d2c259fc.tar.xz
mullvadvpn-e9383947f9bb7ad28da006836c89dcd7d2c259fc.zip
Remove `asyncSettings`
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt6
1 files changed, 0 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
index c4eae685be..2eaf17f8d1 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -31,11 +31,6 @@ class MainActivity : FragmentActivity() {
val daemon
get() = runBlocking { asyncDaemon.await() }
- var asyncSettings = fetchSettings()
- private set
- val settings
- get() = runBlocking { asyncSettings.await() }
-
val locationInfoCache = LocationInfoCache(asyncDaemon)
val problemReport = MullvadProblemReport()
var settingsListener = SettingsListener(this)
@@ -89,7 +84,6 @@ class MainActivity : FragmentActivity() {
settingsListener.onDestroy()
waitForDaemonJob?.cancel()
- asyncSettings.cancel()
asyncDaemon.cancel()
super.onDestroy()