Make it possible to disable IPv6 in the tunnel

2 files changed, 44 insertions, 15 deletions

diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt
index 56bdc562fd..44cc53a256 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/dialog/DnsDialogTest.kt
@@ -21,9 +21,9 @@ class DnsDialogTest {
         DnsDialogViewState(
             input = "",
             validationError = null,
-            isLocal = false,
             isAllowLanEnabled = false,
             index = null,
+            isIpv6Enabled = true,
         )
 
     private fun ComposeContext.initDialog(
@@ -48,7 +48,7 @@ class DnsDialogTest {
     fun testDnsDialogLanWarningShownWhenLanTrafficDisabledAndLocalAddressUsed() =
         composeExtension.use {
             // Arrange
-            initDialog(defaultState.copy(isAllowLanEnabled = false, isLocal = true))
+            initDialog(defaultState.copy(isAllowLanEnabled = false, input = localIpAddress))
 
             // Assert
             onNodeWithText(LOCAL_DNS_SERVER_WARNING).assertExists()
@@ -58,7 +58,7 @@ class DnsDialogTest {
     fun testDnsDialogLanWarningNotShownWhenLanTrafficEnabledAndLocalAddressUsed() =
         composeExtension.use {
             // Arrange
-            initDialog(defaultState.copy(isAllowLanEnabled = true, isLocal = true))
+            initDialog(defaultState.copy(isAllowLanEnabled = true, input = localIpAddress))
 
             // Assert
             onNodeWithText(LOCAL_DNS_SERVER_WARNING).assertDoesNotExist()
@@ -68,7 +68,7 @@ class DnsDialogTest {
     fun testDnsDialogLanWarningNotShownWhenLanTrafficEnabledAndNonLocalAddressUsed() =
         composeExtension.use {
             // Arrange
-            initDialog(defaultState.copy(isAllowLanEnabled = true, isLocal = false))
+            initDialog(defaultState.copy(isAllowLanEnabled = true, input = publicIpAddress))
 
             // Assert
             onNodeWithText(LOCAL_DNS_SERVER_WARNING).assertDoesNotExist()
@@ -78,7 +78,7 @@ class DnsDialogTest {
     fun testDnsDialogLanWarningNotShownWhenLanTrafficDisabledAndNonLocalAddressUsed() =
         composeExtension.use {
             // Arrange
-            initDialog(defaultState.copy(isAllowLanEnabled = false, isLocal = false))
+            initDialog(defaultState.copy(isAllowLanEnabled = false, input = publicIpAddress))
 
             // Assert
             onNodeWithText(LOCAL_DNS_SERVER_WARNING).assertDoesNotExist()
@@ -105,7 +105,7 @@ class DnsDialogTest {
             // Arrange
             initDialog(
                 defaultState.copy(
-                    input = "192.168.0.1",
+                    input = localIpAddress,
                     validationError = ValidationError.DuplicateAddress,
                 )
             )
@@ -120,5 +120,7 @@ class DnsDialogTest {
                 "\"Local Network Sharing\" under VPN settings."
 
         private const val invalidIpAddress = "300.300.300.300"
+        private const val localIpAddress = "192.168.0.1"
+        private const val publicIpAddress = "1.1.1.1"
     }
 }
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
index 073c81b6f8..75d4f20f6e 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
@@ -74,6 +74,7 @@ class VpnSettingsScreenTest {
         navigateToUdp2TcpSettings: () -> Unit = {},
         onToggleAutoStartAndConnectOnBoot: (Boolean) -> Unit = {},
         onSelectDeviceIpVersion: (Constraint<IpVersion>) -> Unit = {},
+        onToggleIpv6Toggle: (Boolean) -> Unit = {},
     ) {
         setContentWithTheme {
             VpnSettingsScreen(
@@ -106,6 +107,7 @@ class VpnSettingsScreenTest {
                 navigateToUdp2TcpSettings = navigateToUdp2TcpSettings,
                 onToggleAutoStartAndConnectOnBoot = onToggleAutoStartAndConnectOnBoot,
                 onSelectDeviceIpVersion = onSelectDeviceIpVersion,
+                onToggleIpv6Toggle = onToggleIpv6Toggle,
             )
         }
     }
@@ -154,9 +156,9 @@ class VpnSettingsScreenTest {
                         isCustomDnsEnabled = true,
                         customDnsItems =
                             listOf(
-                                CustomDnsItem(address = DUMMY_DNS_ADDRESS, false),
-                                CustomDnsItem(address = DUMMY_DNS_ADDRESS_2, false),
-                                CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false),
+                                CustomDnsItem(address = DUMMY_DNS_ADDRESS, false, false),
+                                CustomDnsItem(address = DUMMY_DNS_ADDRESS_2, false, false),
+                                CustomDnsItem(address = DUMMY_DNS_ADDRESS_3, false, false),
                             ),
                     )
             )
@@ -176,7 +178,8 @@ class VpnSettingsScreenTest {
                 state =
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = false,
-                        customDnsItems = listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false)),
+                        customDnsItems =
+                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, false, false)),
                     )
             )
             onNodeWithTag(LAZY_LIST_VPN_SETTINGS_TEST_TAG)
@@ -196,7 +199,13 @@ class VpnSettingsScreenTest {
                         isCustomDnsEnabled = true,
                         isLocalNetworkSharingEnabled = true,
                         customDnsItems =
-                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)),
+                            listOf(
+                                CustomDnsItem(
+                                    address = DUMMY_DNS_ADDRESS,
+                                    isLocal = true,
+                                    isIpv6 = false,
+                                )
+                            ),
                     )
             )
 
@@ -213,7 +222,13 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
                         customDnsItems =
-                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)),
+                            listOf(
+                                CustomDnsItem(
+                                    address = DUMMY_DNS_ADDRESS,
+                                    isLocal = false,
+                                    isIpv6 = false,
+                                )
+                            ),
                     )
             )
 
@@ -230,7 +245,13 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
                         customDnsItems =
-                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = false)),
+                            listOf(
+                                CustomDnsItem(
+                                    address = DUMMY_DNS_ADDRESS,
+                                    isLocal = false,
+                                    isIpv6 = false,
+                                )
+                            ),
                     )
             )
 
@@ -247,7 +268,13 @@ class VpnSettingsScreenTest {
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
                         customDnsItems =
-                            listOf(CustomDnsItem(address = DUMMY_DNS_ADDRESS, isLocal = true)),
+                            listOf(
+                                CustomDnsItem(
+                                    address = DUMMY_DNS_ADDRESS,
+                                    isLocal = true,
+                                    isIpv6 = false,
+                                )
+                            ),
                     )
             )
 
@@ -417,7 +444,7 @@ class VpnSettingsScreenTest {
                 state =
                     VpnSettingsUiState.createDefault(
                         isCustomDnsEnabled = true,
-                        customDnsItems = listOf(CustomDnsItem("1.1.1.1", false)),
+                        customDnsItems = listOf(CustomDnsItem("1.1.1.1", false, false)),
                     ),
                 navigateToDns = mockedClickHandler,
             )