diff options
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt | 12 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt | 8 |
2 files changed, 7 insertions, 13 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 a79307811d..3807495102 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt @@ -22,7 +22,7 @@ class SettingsListener(val daemon: MullvadDaemon) { set(value) { synchronized(this) { field = value - value?.invoke(settings?.accountToken) + value?.invoke(settings.accountToken) } } @@ -31,9 +31,7 @@ class SettingsListener(val daemon: MullvadDaemon) { synchronized(this) { field = value - settings?.let { safeSettings -> - value?.invoke(safeSettings.allowLan) - } + value?.invoke(settings.allowLan) } } @@ -41,7 +39,7 @@ class SettingsListener(val daemon: MullvadDaemon) { set(value) { synchronized(this) { field = value - value?.invoke(settings?.relaySettings) + value?.invoke(settings.relaySettings) } } @@ -63,11 +61,11 @@ class SettingsListener(val daemon: MullvadDaemon) { private fun handleNewSettings(newSettings: Settings) { synchronized(this) { - if (settings?.accountToken != newSettings.accountToken) { + if (settings.accountToken != newSettings.accountToken) { onAccountNumberChange?.invoke(newSettings.accountToken) } - if (settings?.relaySettings != newSettings.relaySettings) { + if (settings.relaySettings != newSettings.relaySettings) { onRelaySettingsChange?.invoke(newSettings.relaySettings) } 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 387864f26c..1a3eff2fa1 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt @@ -30,9 +30,7 @@ class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) { } allowLanToggle = view.findViewById<CellSwitch>(R.id.allow_lan_toggle).apply { - settingsListener.settings?.let { settings -> - forcefullySetState(boolToSwitchState(settings.allowLan)) - } + forcefullySetState(boolToSwitchState(settingsListener.settings.allowLan)) listener = { state -> when (state) { @@ -43,9 +41,7 @@ class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) { } autoConnectToggle = view.findViewById<CellSwitch>(R.id.auto_connect_toggle).apply { - settingsListener.settings?.let { settings -> - forcefullySetState(boolToSwitchState(settings.autoConnect)) - } + forcefullySetState(boolToSwitchState(settingsListener.settings.autoConnect)) listener = { state -> when (state) { |