summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt12
1 files changed, 10 insertions, 2 deletions
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 83db04fa4b..6bfca434c4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt
@@ -63,8 +63,16 @@ class PreferencesFragment : ServiceDependentFragment(OnNoService.GoBack) {
private fun updateUi(settings: Settings) {
jobTracker.newUiJob("updateUi") {
- allowLanToggle.state = boolToSwitchState(settings.allowLan)
- autoConnectToggle.state = boolToSwitchState(settings.autoConnect)
+ val allowLanState = boolToSwitchState(settings.allowLan)
+ val autoConnectState = boolToSwitchState(settings.autoConnect)
+
+ if (isVisible) {
+ allowLanToggle.state = allowLanState
+ autoConnectToggle.state = autoConnectState
+ } else {
+ allowLanToggle.forcefullySetState(allowLanState)
+ autoConnectToggle.forcefullySetState(autoConnectState)
+ }
}
}