diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-06-09 15:04:04 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-06-09 16:00:27 +0200 |
| commit | fbbfc596d10d7b26c30cf36f9f44ff06ff435fe7 (patch) | |
| tree | aa8dab1fc25f334a211a715098947801eadc9dba /android/app | |
| parent | e36d078360f1e0053cebd00246b08f1f58f08276 (diff) | |
| download | mullvadvpn-fbbfc596d10d7b26c30cf36f9f44ff06ff435fe7.tar.xz mullvadvpn-fbbfc596d10d7b26c30cf36f9f44ff06ff435fe7.zip | |
Fix auto-connect and local network sharing toggle state
The UI glitch was that the auto-connect and local network sharing
toggles would have the wrong state when certain info dialogis were
opened due to an issue with mapping the VM state to a UI state.
Diffstat (limited to 'android/app')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt index 520296784a..8cf675b786 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelState.kt @@ -54,6 +54,7 @@ data class VpnSettingsViewModelState( isAllowLanEnabled = isAllowLanEnabled, customDnsItems = customDnsList, contentBlockersOptions = contentBlockersOptions, + selectedObfuscation = selectedObfuscation, quantumResistant = quantumResistant ) is VpnSettingsDialogState.ContentBlockersInfoDialog -> @@ -77,6 +78,7 @@ data class VpnSettingsViewModelState( isAllowLanEnabled = isAllowLanEnabled, customDnsItems = customDnsList, contentBlockersOptions = contentBlockersOptions, + selectedObfuscation = selectedObfuscation, quantumResistant = quantumResistant ) is VpnSettingsDialogState.MalwareInfoDialog -> @@ -94,6 +96,8 @@ data class VpnSettingsViewModelState( is VpnSettingsDialogState.ObfuscationInfoDialog -> VpnSettingsUiState.ObfuscationInfoDialogUiState( mtu = mtuValue, + isAutoConnectEnabled = isAutoConnectEnabled, + isLocalNetworkSharingEnabled = isLocalNetworkSharingEnabled, isCustomDnsEnabled = isCustomDnsEnabled, isAllowLanEnabled = isAllowLanEnabled, customDnsItems = customDnsList, @@ -104,6 +108,8 @@ data class VpnSettingsViewModelState( is VpnSettingsDialogState.QuantumResistanceInfoDialog -> { VpnSettingsUiState.QuantumResistanceInfoDialogUiState( mtu = mtuValue, + isAutoConnectEnabled = isAutoConnectEnabled, + isLocalNetworkSharingEnabled = isLocalNetworkSharingEnabled, isCustomDnsEnabled = isCustomDnsEnabled, isAllowLanEnabled = isAllowLanEnabled, customDnsItems = customDnsList, |