Rename selected obfuscation and fix tests

mullvad · Sep 2, 2024 · 487993e · 487993e
1 parent 308fb3d
commit 487993e
Show file tree

Hide file tree

Showing 15 changed files with 88 additions and 87 deletions.
diff --git a/...app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/...app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
@@ -316,7 +316,7 @@ class VpnSettingsScreenTest {
                 VpnSettingsScreen(
                     state =
                         VpnSettingsUiState.createDefault(
-                            customWireguardPort = Constraint.Only(Port(4000))
+                            customWireguardPort = Port(4000)
                         )
                 )
             }
@@ -339,7 +339,7 @@ class VpnSettingsScreenTest {
                     state =
                         VpnSettingsUiState.createDefault(
                             selectedWireguardPort = Constraint.Only(Port(4000)),
-                            customWireguardPort = Constraint.Only(Port(4000)),
+                            customWireguardPort = Port(4000),
                         ),
                     onWireguardPortSelected = onWireguardPortSelected,
                 )

diff --git a/...vpn/compose/cell/SelectObfuscationCell.kt → ...advpn/compose/cell/ObfuscationModeCell.kt b/...vpn/compose/cell/SelectObfuscationCell.kt → ...advpn/compose/cell/ObfuscationModeCell.kt
@@ -21,8 +21,8 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.preview.SelectObfuscationCellPreviewParameterProvider
 import net.mullvad.mullvadvpn.lib.model.Constraint
+import net.mullvad.mullvadvpn.lib.model.ObfuscationMode
 import net.mullvad.mullvadvpn.lib.model.Port
-import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.lib.theme.color.selected
@@ -31,13 +31,13 @@ import net.mullvad.mullvadvpn.lib.theme.typeface.listItemText
 
 @Preview
 @Composable
-private fun PreviewSelectObfuscationCellCell(
+private fun PreviewObfuscationCell(
     @PreviewParameter(SelectObfuscationCellPreviewParameterProvider::class)
-    selectedObfuscationCellData: Triple<SelectedObfuscation, Constraint<Port>, Boolean>
+    selectedObfuscationCellData: Triple<ObfuscationMode, Constraint<Port>, Boolean>
 ) {
     AppTheme {
-        SelectObfuscationCell(
-            selectedObfuscation = selectedObfuscationCellData.first,
+        ObfuscationModeCell(
+            obfuscationMode = selectedObfuscationCellData.first,
             port = selectedObfuscationCellData.second,
             isSelected = selectedObfuscationCellData.third,
             onSelected = {},
@@ -47,11 +47,11 @@ private fun PreviewSelectObfuscationCellCell(
 }
 
 @Composable
-fun SelectObfuscationCell(
-    selectedObfuscation: SelectedObfuscation,
+fun ObfuscationModeCell(
+    obfuscationMode: ObfuscationMode,
     port: Constraint<Port>,
     isSelected: Boolean,
-    onSelected: (SelectedObfuscation) -> Unit,
+    onSelected: (ObfuscationMode) -> Unit,
     onNavigate: () -> Unit = {},
 ) {
     Row(
@@ -66,9 +66,9 @@ fun SelectObfuscationCell(
             titleColor = MaterialTheme.colorScheme.onSurface,
             subtitleStyle = MaterialTheme.typography.listItemSubText,
             subtitleColor = MaterialTheme.colorScheme.onSurface,
-            titleText = selectedObfuscation.toTitle(),
+            titleText = obfuscationMode.toTitle(),
             subtitleText = stringResource(id = R.string.port_x, port.toSubTitle()),
-            onCellClicked = { onSelected(selectedObfuscation) },
+            onCellClicked = { onSelected(obfuscationMode) },
             minHeight = Dimens.cellHeight,
             background =
                 if (isSelected) {
@@ -101,12 +101,12 @@ fun SelectObfuscationCell(
 }
 
 @Composable
-private fun SelectedObfuscation.toTitle() =
+private fun ObfuscationMode.toTitle() =
     when (this) {
-        SelectedObfuscation.Auto -> stringResource(id = R.string.automatic)
-        SelectedObfuscation.Off -> stringResource(id = R.string.off)
-        SelectedObfuscation.Udp2Tcp -> stringResource(id = R.string.upd_over_tcp)
-        SelectedObfuscation.Shadowsocks -> stringResource(id = R.string.shadowsocks)
+        ObfuscationMode.Auto -> stringResource(id = R.string.automatic)
+        ObfuscationMode.Off -> stringResource(id = R.string.off)
+        ObfuscationMode.Udp2Tcp -> stringResource(id = R.string.upd_over_tcp)
+        ObfuscationMode.Shadowsocks -> stringResource(id = R.string.shadowsocks)
     }
 
 @Composable

diff --git a/...n/net/mullvad/mullvadvpn/compose/preview/SelectObfuscationCellPreviewParameterProvider.kt b/...n/net/mullvad/mullvadvpn/compose/preview/SelectObfuscationCellPreviewParameterProvider.kt
@@ -2,21 +2,21 @@ package net.mullvad.mullvadvpn.compose.preview
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import net.mullvad.mullvadvpn.lib.model.Constraint
+import net.mullvad.mullvadvpn.lib.model.ObfuscationMode
 import net.mullvad.mullvadvpn.lib.model.Port
-import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation
 
 class SelectObfuscationCellPreviewParameterProvider :
-    PreviewParameterProvider<Triple<SelectedObfuscation, Constraint<Port>, Boolean>> {
-    override val values: Sequence<Triple<SelectedObfuscation, Constraint<Port>, Boolean>> =
+    PreviewParameterProvider<Triple<ObfuscationMode, Constraint<Port>, Boolean>> {
+    override val values: Sequence<Triple<ObfuscationMode, Constraint<Port>, Boolean>> =
         sequenceOf(
-            Triple(SelectedObfuscation.Shadowsocks, Constraint.Any, false),
-            Triple(SelectedObfuscation.Shadowsocks, Constraint.Any, true),
-            Triple(SelectedObfuscation.Shadowsocks, Constraint.Only(Port(PORT)), false),
-            Triple(SelectedObfuscation.Shadowsocks, Constraint.Only(Port(PORT)), true),
-            Triple(SelectedObfuscation.Udp2Tcp, Constraint.Any, false),
-            Triple(SelectedObfuscation.Udp2Tcp, Constraint.Any, true),
-            Triple(SelectedObfuscation.Udp2Tcp, Constraint.Only(Port(PORT)), false),
-            Triple(SelectedObfuscation.Udp2Tcp, Constraint.Only(Port(PORT)), true),
+            Triple(ObfuscationMode.Shadowsocks, Constraint.Any, false),
+            Triple(ObfuscationMode.Shadowsocks, Constraint.Any, true),
+            Triple(ObfuscationMode.Shadowsocks, Constraint.Only(Port(PORT)), false),
+            Triple(ObfuscationMode.Shadowsocks, Constraint.Only(Port(PORT)), true),
+            Triple(ObfuscationMode.Udp2Tcp, Constraint.Any, false),
+            Triple(ObfuscationMode.Udp2Tcp, Constraint.Any, true),
+            Triple(ObfuscationMode.Udp2Tcp, Constraint.Only(Port(PORT)), false),
+            Triple(ObfuscationMode.Udp2Tcp, Constraint.Only(Port(PORT)), true),
         )
 }
 

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -63,7 +63,7 @@ import net.mullvad.mullvadvpn.compose.cell.MtuComposeCell
 import net.mullvad.mullvadvpn.compose.cell.MtuSubtitle
 import net.mullvad.mullvadvpn.compose.cell.NavigationComposeCell
 import net.mullvad.mullvadvpn.compose.cell.NormalSwitchComposeCell
-import net.mullvad.mullvadvpn.compose.cell.SelectObfuscationCell
+import net.mullvad.mullvadvpn.compose.cell.ObfuscationModeCell
 import net.mullvad.mullvadvpn.compose.cell.SelectableCell
 import net.mullvad.mullvadvpn.compose.cell.SwitchComposeSubtitleCell
 import net.mullvad.mullvadvpn.compose.communication.DnsDialogResult
@@ -91,10 +91,10 @@ import net.mullvad.mullvadvpn.compose.util.showSnackbarImmediately
 import net.mullvad.mullvadvpn.constant.WIREGUARD_PRESET_PORTS
 import net.mullvad.mullvadvpn.lib.model.Constraint
 import net.mullvad.mullvadvpn.lib.model.Mtu
+import net.mullvad.mullvadvpn.lib.model.ObfuscationMode
 import net.mullvad.mullvadvpn.lib.model.Port
 import net.mullvad.mullvadvpn.lib.model.PortRange
 import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
-import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
@@ -127,7 +127,7 @@ private fun PreviewVpnSettings() {
             navigateToDns = { _, _ -> },
             onToggleDnsClick = {},
             onBackClick = {},
-            onSelectObfuscationSetting = {},
+            onSelectObfuscationMode = {},
             onSelectQuantumResistanceSetting = {},
             onWireguardPortSelected = {},
         )
@@ -251,7 +251,7 @@ fun VpnSettings(
             },
         onToggleDnsClick = vm::onToggleCustomDns,
         onBackClick = dropUnlessResumed { navigator.navigateUp() },
-        onSelectObfuscationSetting = vm::onSelectObfuscationSetting,
+        onSelectObfuscationMode = vm::onSelectObfuscationMode,
         onSelectQuantumResistanceSetting = vm::onSelectQuantumResistanceSetting,
         onWireguardPortSelected = vm::onWireguardPortSelected,
         navigateToShadowSocksSettings =
@@ -289,7 +289,7 @@ fun VpnSettingsScreen(
     navigateToDns: (index: Int?, address: String?) -> Unit = { _, _ -> },
     onToggleDnsClick: (Boolean) -> Unit = {},
     onBackClick: () -> Unit = {},
-    onSelectObfuscationSetting: (selectedObfuscation: SelectedObfuscation) -> Unit = {},
+    onSelectObfuscationMode: (obfuscationMode: ObfuscationMode) -> Unit = {},
     onSelectQuantumResistanceSetting: (quantumResistant: QuantumResistantState) -> Unit = {},
     onWireguardPortSelected: (port: Constraint<Port>) -> Unit = {},
     navigateToShadowSocksSettings: () -> Unit = {},
@@ -561,33 +561,33 @@ fun VpnSettingsScreen(
             itemWithDivider {
                 SelectableCell(
                     title = stringResource(id = R.string.automatic),
-                    isSelected = state.selectedObfuscation == SelectedObfuscation.Auto,
-                    onCellClicked = { onSelectObfuscationSetting(SelectedObfuscation.Auto) },
+                    isSelected = state.obfuscationMode == ObfuscationMode.Auto,
+                    onCellClicked = { onSelectObfuscationMode(ObfuscationMode.Auto) },
                 )
             }
             itemWithDivider {
-                SelectObfuscationCell(
-                    selectedObfuscation = SelectedObfuscation.Shadowsocks,
-                    isSelected = state.selectedObfuscation == SelectedObfuscation.Shadowsocks,
+                ObfuscationModeCell(
+                    obfuscationMode = ObfuscationMode.Shadowsocks,
+                    isSelected = state.obfuscationMode == ObfuscationMode.Shadowsocks,
                     port = state.selectedShadowsSocksObfuscationPort,
-                    onSelected = onSelectObfuscationSetting,
+                    onSelected = onSelectObfuscationMode,
                     onNavigate = navigateToShadowSocksSettings,
                 )
             }
             itemWithDivider {
-                SelectObfuscationCell(
-                    selectedObfuscation = SelectedObfuscation.Udp2Tcp,
-                    isSelected = state.selectedObfuscation == SelectedObfuscation.Udp2Tcp,
+                ObfuscationModeCell(
+                    obfuscationMode = ObfuscationMode.Udp2Tcp,
+                    isSelected = state.obfuscationMode == ObfuscationMode.Udp2Tcp,
                     port = state.selectedUdp2TcpObfuscationPort,
-                    onSelected = onSelectObfuscationSetting,
+                    onSelected = onSelectObfuscationMode,
                     onNavigate = navigateToUdp2TcpSettings,
                 )
             }
             itemWithDivider {
                 SelectableCell(
                     title = stringResource(id = R.string.off),
-                    isSelected = state.selectedObfuscation == SelectedObfuscation.Off,
-                    onCellClicked = { onSelectObfuscationSetting(SelectedObfuscation.Off) },
+                    isSelected = state.obfuscationMode == ObfuscationMode.Off,
+                    onCellClicked = { onSelectObfuscationMode(ObfuscationMode.Off) },
                 )
             }
 

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/VpnSettingsUiState.kt
@@ -3,10 +3,10 @@ package net.mullvad.mullvadvpn.compose.state
 import net.mullvad.mullvadvpn.lib.model.Constraint
 import net.mullvad.mullvadvpn.lib.model.DefaultDnsOptions
 import net.mullvad.mullvadvpn.lib.model.Mtu
+import net.mullvad.mullvadvpn.lib.model.ObfuscationMode
 import net.mullvad.mullvadvpn.lib.model.Port
 import net.mullvad.mullvadvpn.lib.model.PortRange
 import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
-import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation
 import net.mullvad.mullvadvpn.viewmodel.CustomDnsItem
 
 data class VpnSettingsUiState(
@@ -16,7 +16,7 @@ data class VpnSettingsUiState(
     val isCustomDnsEnabled: Boolean,
     val customDnsItems: List<CustomDnsItem>,
     val contentBlockersOptions: DefaultDnsOptions,
-    val selectedObfuscation: SelectedObfuscation,
+    val obfuscationMode: ObfuscationMode,
     val selectedUdp2TcpObfuscationPort: Constraint<Port>,
     val selectedShadowsSocksObfuscationPort: Constraint<Port>,
     val quantumResistant: QuantumResistantState,
@@ -37,7 +37,7 @@ data class VpnSettingsUiState(
             isCustomDnsEnabled: Boolean = false,
             customDnsItems: List<CustomDnsItem> = emptyList(),
             contentBlockersOptions: DefaultDnsOptions = DefaultDnsOptions(),
-            selectedObfuscation: SelectedObfuscation = SelectedObfuscation.Off,
+            obfuscationMode: ObfuscationMode = ObfuscationMode.Off,
             selectedUdp2TcpObfuscationPort: Constraint<Port> = Constraint.Any,
             selectedShadowsSocksObfuscationPort: Constraint<Port> = Constraint.Any,
             quantumResistant: QuantumResistantState = QuantumResistantState.Off,
@@ -53,7 +53,7 @@ data class VpnSettingsUiState(
                 isCustomDnsEnabled,
                 customDnsItems,
                 contentBlockersOptions,
-                selectedObfuscation,
+                obfuscationMode,
                 selectedUdp2TcpObfuscationPort,
                 selectedShadowsSocksObfuscationPort,
                 quantumResistant,

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt
@@ -14,9 +14,9 @@ import net.mullvad.mullvadvpn.lib.model.DefaultDnsOptions
 import net.mullvad.mullvadvpn.lib.model.DnsOptions
 import net.mullvad.mullvadvpn.lib.model.DnsState
 import net.mullvad.mullvadvpn.lib.model.Mtu
+import net.mullvad.mullvadvpn.lib.model.ObfuscationMode
 import net.mullvad.mullvadvpn.lib.model.Port
 import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
-import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation
 import net.mullvad.mullvadvpn.lib.model.Settings
 
 class SettingsRepository(
@@ -65,7 +65,7 @@ class SettingsRepository(
     suspend fun setWireguardQuantumResistant(value: QuantumResistantState) =
         managementService.setWireguardQuantumResistant(value)
 
-    suspend fun setObfuscation(value: SelectedObfuscation) = managementService.setObfuscation(value)
+    suspend fun setObfuscation(value: ObfuscationMode) = managementService.setObfuscation(value)
 
     suspend fun setAutoConnect(isEnabled: Boolean) = managementService.setAutoConnect(isEnabled)
 

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
@@ -23,9 +23,9 @@ import net.mullvad.mullvadvpn.constant.WIREGUARD_PRESET_PORTS
 import net.mullvad.mullvadvpn.lib.model.Constraint
 import net.mullvad.mullvadvpn.lib.model.DefaultDnsOptions
 import net.mullvad.mullvadvpn.lib.model.DnsState
+import net.mullvad.mullvadvpn.lib.model.ObfuscationMode
 import net.mullvad.mullvadvpn.lib.model.Port
 import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
-import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation
 import net.mullvad.mullvadvpn.lib.model.Settings
 import net.mullvad.mullvadvpn.lib.model.WireguardConstraints
 import net.mullvad.mullvadvpn.repository.RelayListRepository
@@ -67,8 +67,7 @@ class VpnSettingsViewModel(
                     customDnsList = settings?.addresses()?.asStringAddressList() ?: listOf(),
                     contentBlockersOptions =
                         settings?.contentBlockersSettings() ?: DefaultDnsOptions(),
-                    selectedObfuscation =
-                        settings?.selectedObfuscationSettings() ?: SelectedObfuscation.Off,
+                    obfuscationMode = settings?.selectedObfuscationMode() ?: ObfuscationMode.Off,
                     selectedUdp2TcpObfuscationPort =
                         settings?.obfuscationSettings?.udp2tcp?.port ?: Constraint.Any,
                     selectedShadowsocksObfuscationPort =
@@ -202,9 +201,9 @@ class VpnSettingsViewModel(
         }
     }
 
-    fun onSelectObfuscationSetting(selectedObfuscation: SelectedObfuscation) {
+    fun onSelectObfuscationMode(obfuscationMode: ObfuscationMode) {
         viewModelScope.launch(dispatcher) {
-            repository.setObfuscation(selectedObfuscation).onLeft {
+            repository.setObfuscation(obfuscationMode).onLeft {
                 _uiSideEffect.send(VpnSettingsSideEffect.ShowToast.GenericError)
             }
         }
@@ -280,7 +279,7 @@ class VpnSettingsViewModel(
 
     private fun Settings.contentBlockersSettings() = tunnelOptions.dnsOptions.defaultOptions
 
-    private fun Settings.selectedObfuscationSettings() = obfuscationSettings.selectedObfuscation
+    private fun Settings.selectedObfuscationMode() = obfuscationSettings.selectedObfuscationMode
 
     private fun Settings.getWireguardPort() =
         relaySettings.relayConstraints.wireguardConstraints.port

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
@@ -4,10 +4,10 @@ import net.mullvad.mullvadvpn.compose.state.VpnSettingsUiState
 import net.mullvad.mullvadvpn.lib.model.Constraint
 import net.mullvad.mullvadvpn.lib.model.DefaultDnsOptions
 import net.mullvad.mullvadvpn.lib.model.Mtu
+import net.mullvad.mullvadvpn.lib.model.ObfuscationMode
 import net.mullvad.mullvadvpn.lib.model.Port
 import net.mullvad.mullvadvpn.lib.model.PortRange
 import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
-import net.mullvad.mullvadvpn.lib.model.SelectedObfuscation
 
 data class VpnSettingsViewModelState(
     val mtuValue: Mtu?,
@@ -16,7 +16,7 @@ data class VpnSettingsViewModelState(
     val isCustomDnsEnabled: Boolean,
     val customDnsList: List<CustomDnsItem>,
     val contentBlockersOptions: DefaultDnsOptions,
-    val selectedObfuscation: SelectedObfuscation,
+    val obfuscationMode: ObfuscationMode,
     val selectedUdp2TcpObfuscationPort: Constraint<Port>,
     val selectedShadowsocksObfuscationPort: Constraint<Port>,
     val quantumResistant: QuantumResistantState,
@@ -37,7 +37,7 @@ data class VpnSettingsViewModelState(
             isCustomDnsEnabled,
             customDnsList,
             contentBlockersOptions,
-            selectedObfuscation,
+            obfuscationMode,
             selectedUdp2TcpObfuscationPort,
             selectedShadowsocksObfuscationPort,
             quantumResistant,
@@ -56,7 +56,7 @@ data class VpnSettingsViewModelState(
                 isCustomDnsEnabled = false,
                 customDnsList = listOf(),
                 contentBlockersOptions = DefaultDnsOptions(),
-                selectedObfuscation = SelectedObfuscation.Auto,
+                obfuscationMode = ObfuscationMode.Auto,
                 selectedUdp2TcpObfuscationPort = Constraint.Any,
                 selectedShadowsocksObfuscationPort = Constraint.Any,
                 quantumResistant = QuantumResistantState.Off,

diff --git a/.../app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ShadowsocksSettingsViewModelTest.kt b/.../app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/ShadowsocksSettingsViewModelTest.kt
@@ -65,10 +65,13 @@ class ShadowsocksSettingsViewModelTest {
     @Test
     fun `uiState should reflect latest port range value from relay list`() = runTest {
         // Arrange
+        val mockSettings: Settings = mockk()
+        val port = Port(123)
+        every { mockSettings.obfuscationSettings.shadowsocks.port } returns Constraint.Only(port)
         val mockPortRange: List<PortRange> = listOf(mockk())
 
         portRangesFlow.update { mockPortRange }
-        settingsFlow.update { mockk(relaxed = true) }
+        settingsFlow.update { mockSettings }
 
         // Act, Assert
         viewModel.uiState.test {