diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-10 22:44:29 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-23 12:36:35 +0000 |
| commit | 3412ed642e267b2a40d0556feea5229e8d15faa1 (patch) | |
| tree | 6fef7e82ba1f8f5f059604060a9c4054c3df5ea2 /android | |
| parent | 05e23e65b0ad77ae5c05dfaaec6d32c94a15eeee (diff) | |
| download | mullvadvpn-3412ed642e267b2a40d0556feea5229e8d15faa1.tar.xz mullvadvpn-3412ed642e267b2a40d0556feea5229e8d15faa1.zip | |
Use settings notifier instance directly
Diffstat (limited to 'android')
3 files changed, 6 insertions, 6 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 4b73f9a878..8a84642399 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt @@ -54,7 +54,7 @@ class AppVersionInfoCache( private set init { - settingsListener.subscribe(this) { settings -> + settingsListener.settingsNotifier.subscribe(this) { settings -> showBetaReleases = settings.showBetaReleases } } @@ -68,7 +68,7 @@ class AppVersionInfoCache( fun onDestroy() { setUpJob.cancel() - settingsListener.unsubscribe(this) + settingsListener.settingsNotifier.unsubscribe(this) daemon.onAppVersionInfoChange = null } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt index 671a232220..ede5345bd4 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt @@ -67,7 +67,7 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { detachBackButtonHandler() customDnsAdapter.onDestroy() titleController.onDestroy() - settingsListener.unsubscribe(this) + settingsListener.settingsNotifier.unsubscribe(this) } private fun configureHeader(view: View) { @@ -109,7 +109,7 @@ class AdvancedFragment : ServiceDependentFragment(OnNoService.GoBack) { } } - settingsListener.subscribe(this) { settings -> + settingsListener.settingsNotifier.subscribe(this) { settings -> updateUi(settings) } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt index 63af88cdae..884217a2ce 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt @@ -43,7 +43,7 @@ class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) { } } - settingsListener.subscribe(this) { settings -> + settingsListener.settingsNotifier.subscribe(this) { settings -> updateUi(settings) } @@ -54,7 +54,7 @@ class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) { override fun onSafelyDestroyView() { titleController.onDestroy() - settingsListener.unsubscribe(this) + settingsListener.settingsNotifier.unsubscribe(this) } private fun updateUi(settings: Settings) { |