diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-08 03:05:41 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-13 11:33:51 +0000 |
| commit | 52a66e4c4907dd03962674d02d209de8b19c6333 (patch) | |
| tree | 9ddda507069cc96ac5da7ce295bccd816a62a935 /android/src | |
| parent | c84bc8e005c33ad05c58f1de2f4e13b7b40e8f22 (diff) | |
| download | mullvadvpn-52a66e4c4907dd03962674d02d209de8b19c6333.tar.xz mullvadvpn-52a66e4c4907dd03962674d02d209de8b19c6333.zip | |
Decouple `SettingsListener` from `MainActivity`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt | 6 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt index 9917acc606..a1c87442ba 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt @@ -1,14 +1,14 @@ package net.mullvad.mullvadvpn.dataproxy +import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.model.RelaySettings import net.mullvad.mullvadvpn.model.Settings import net.mullvad.mullvadvpn.service.MullvadDaemon -import net.mullvad.mullvadvpn.ui.MainActivity -class SettingsListener(val parentActivity: MainActivity) { +class SettingsListener(val asyncDaemon: Deferred<MullvadDaemon>) { private lateinit var daemon: MullvadDaemon private val setUpJob = setUp() @@ -41,7 +41,7 @@ class SettingsListener(val parentActivity: MainActivity) { } private fun setUp() = GlobalScope.launch(Dispatchers.Default) { - daemon = parentActivity.daemon.await() + daemon = asyncDaemon.await() listenerId = daemon.onSettingsChange.subscribe { maybeSettings -> maybeSettings?.let { settings -> handleNewSettings(settings) } 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 4eee5f0ca2..7c6daf4366 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -43,7 +43,7 @@ class MainActivity : FragmentActivity() { val connectionProxy = SmartDeferred(configureConnectionProxy()) val keyStatusListener = KeyStatusListener(daemon) val problemReport = MullvadProblemReport() - var settingsListener = SettingsListener(this) + var settingsListener = SettingsListener(daemon) var relayListListener = RelayListListener(this) val locationInfoCache = LocationInfoCache(daemon, connectivityListener, relayListListener) val accountCache = AccountCache(settingsListener, daemon) |