diff options
| author | Albin <albin@mullvad.net> | 2023-06-09 16:03:30 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-06-09 16:03:30 +0200 |
| commit | 75a2c206f844650d9993f4a4a0264f8c98acd5d4 (patch) | |
| tree | aa8dab1fc25f334a211a715098947801eadc9dba /android | |
| parent | e36d078360f1e0053cebd00246b08f1f58f08276 (diff) | |
| parent | fbbfc596d10d7b26c30cf36f9f44ff06ff435fe7 (diff) | |
| download | mullvadvpn-75a2c206f844650d9993f4a4a0264f8c98acd5d4.tar.xz mullvadvpn-75a2c206f844650d9993f4a4a0264f8c98acd5d4.zip | |
Merge branch 'fix-vpn-settings-dialog-states'
Diffstat (limited to 'android')
| -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, |