diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-08 19:21:22 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-23 12:36:35 +0000 |
| commit | ffca08d5439761c112375254226d95369c3dca96 (patch) | |
| tree | 9270a51b15cf4421db9b6297505c924cd0f36e59 /android/src | |
| parent | 052ceba74eea0826b210b37efa85cf56c6aaddd8 (diff) | |
| download | mullvadvpn-ffca08d5439761c112375254226d95369c3dca96.tar.xz mullvadvpn-ffca08d5439761c112375254226d95369c3dca96.zip | |
Don't animate toggle transition if it isn't shown
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/PreferencesFragment.kt | 12 |
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) + } } } |