summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-01-12 12:43:02 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-03-23 12:36:34 +0000
commit7d44141813f920d22d2728912760050870cfcb67 (patch)
treeb9fb11ee395c9f5eaf6e568a3b336c67943d8aec /android/src/main
parent08c49ea31be1213898d4a49ebdfa593a9cc100c2 (diff)
downloadmullvadvpn-7d44141813f920d22d2728912760050870cfcb67.tar.xz
mullvadvpn-7d44141813f920d22d2728912760050870cfcb67.zip
Use `notifiable` delegate in `SettingsListener`
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/SettingsListener.kt12
1 files changed, 4 insertions, 8 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SettingsListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SettingsListener.kt
index e3442791ec..8f5154ea54 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SettingsListener.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/SettingsListener.kt
@@ -4,17 +4,13 @@ import net.mullvad.mullvadvpn.model.Settings
import net.mullvad.talpid.util.EventNotifier
class SettingsListener(val daemon: MullvadDaemon, val initialSettings: Settings) {
- var settings: Settings = initialSettings
- private set(value) {
- settingsNotifier.notify(value)
- field = value
- }
-
- private val settingsNotifier: EventNotifier<Settings> = EventNotifier(settings)
-
val accountNumberNotifier = EventNotifier(initialSettings.accountToken)
val dnsOptionsNotifier = EventNotifier(initialSettings.tunnelOptions.dnsOptions)
val relaySettingsNotifier = EventNotifier(initialSettings.relaySettings)
+ val settingsNotifier: EventNotifier<Settings> = EventNotifier(initialSettings)
+
+ var settings by settingsNotifier.notifiable()
+ private set
init {
daemon.onSettingsChange.subscribe(this) { maybeSettings ->