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 ->