diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-08 03:00:51 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-13 11:33:50 +0000 |
| commit | c84bc8e005c33ad05c58f1de2f4e13b7b40e8f22 (patch) | |
| tree | 33550ac9837bd75ee714c2792f8fe3e59847d552 /android/src | |
| parent | bdbd3d107eeb3472513a3ce790e81022b151c607 (diff) | |
| download | mullvadvpn-c84bc8e005c33ad05c58f1de2f4e13b7b40e8f22.tar.xz mullvadvpn-c84bc8e005c33ad05c58f1de2f4e13b7b40e8f22.zip | |
Decouple `AppVersionInfoCache` from `MainActivity`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt | 8 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt index 032dfe9eb9..ac01929b1b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt @@ -1,18 +1,18 @@ package net.mullvad.mullvadvpn.dataproxy import android.content.Context +import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.model.AppVersionInfo -import net.mullvad.mullvadvpn.ui.MainActivity +import net.mullvad.mullvadvpn.service.MullvadDaemon -class AppVersionInfoCache(val parentActivity: MainActivity) { +class AppVersionInfoCache(val context: Context, val daemon: Deferred<MullvadDaemon>) { companion object { val LEGACY_SHARED_PREFERENCES = "app_version_info_cache" } - private val daemon = parentActivity.daemon private val setUpJob = setUp() private var appVersionInfo: AppVersionInfo? = null @@ -61,7 +61,7 @@ class AppVersionInfoCache(val parentActivity: MainActivity) { private set fun onCreate() { - parentActivity.getSharedPreferences(LEGACY_SHARED_PREFERENCES, Context.MODE_PRIVATE) + context.getSharedPreferences(LEGACY_SHARED_PREFERENCES, Context.MODE_PRIVATE) .edit() .clear() .commit() 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 7660e240bb..4eee5f0ca2 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -39,7 +39,7 @@ class MainActivity : FragmentActivity() { var service = CompletableDeferred<MullvadVpnService.LocalBinder>() private set - var appVersionInfoCache = AppVersionInfoCache(this) + var appVersionInfoCache = AppVersionInfoCache(this, daemon) val connectionProxy = SmartDeferred(configureConnectionProxy()) val keyStatusListener = KeyStatusListener(daemon) val problemReport = MullvadProblemReport() |