WIP

Author: Pururun

CHANGELOG.md

@@ -31,7 +31,6 @@ Line wrap the file at 100 chars.                                              Th
 
 ### Fixed
 - Fix `mullvad-cli` panicking if it tried to write to a closed pipe on Linux and macOS.
-- Will no longer try to connect over IPv4 if IPv4 is not available.
 
 #### Windows
 - Fix error setting up tunnel when MTU was incorrectly set to a value below 1280 for IPv6.

android/CHANGELOG.md

@@ -38,7 +38,6 @@ Line wrap the file at 100 chars.                                              Th
 
 ### Fixed
 - Will no longer try to connect over IPv6 if IPv6 is not available.
-- Will no longer try to connect over IPv4 if IPv4 is not available.
 
 
 ## [android/2025.1-beta1] - 2025-03-05

android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt

@@ -74,7 +74,7 @@ class VpnSettingsScreenTest {
         navigateToUdp2TcpSettings: () -> Unit = {},
         onToggleAutoStartAndConnectOnBoot: (Boolean) -> Unit = {},
         onSelectDeviceIpVersion: (Constraint<IpVersion>) -> Unit = {},
-        onToggleIPv6Toggle: (Boolean) -> Unit = {},
+        onToggleIpv6Toggle: (Boolean) -> Unit = {},
     ) {
         setContentWithTheme {
             VpnSettingsScreen(
@@ -107,7 +107,7 @@ class VpnSettingsScreenTest {
                 navigateToUdp2TcpSettings = navigateToUdp2TcpSettings,
                 onToggleAutoStartAndConnectOnBoot = onToggleAutoStartAndConnectOnBoot,
                 onSelectDeviceIpVersion = onSelectDeviceIpVersion,
-                onToggleIpv6Toggle = onToggleIPv6Toggle,
+                onToggleIpv6Toggle = onToggleIpv6Toggle,
             )
         }
     }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt

@@ -272,7 +272,7 @@ fun VpnSettings(
             dropUnlessResumed { navigator.navigate(Udp2TcpSettingsDestination) },
         onToggleAutoStartAndConnectOnBoot = vm::onToggleAutoStartAndConnectOnBoot,
         onSelectDeviceIpVersion = vm::onDeviceIpVersionSelected,
-        onToggleIpv6Toggle = vm::setIpV6Enabled,
+        onToggleIpv6Toggle = vm::setIpv6Enabled,
     )
 }
 

android/app/src/main/kotlin/net/mullvad/mullvadvpn/repository/SettingsRepository.kt

@@ -75,5 +75,5 @@ class SettingsRepository(
 
     suspend fun setDaitaDirectOnly(enabled: Boolean) = managementService.setDaitaDirectOnly(enabled)
 
-    suspend fun setIpV6Enabled(enabled: Boolean) = managementService.setIpv6Enabled(enabled)
+    suspend fun setIpv6Enabled(enabled: Boolean) = managementService.setIpv6Enabled(enabled)
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DnsDialogViewModel.kt

@@ -35,15 +35,27 @@ sealed interface DnsDialogSideEffect {
 data class DnsDialogViewState(
     val input: String,
     val validationError: ValidationError?,
-    val isLocal: Boolean,
     val isAllowLanEnabled: Boolean,
-    val isIpv6: Boolean,
     val isIpv6Enabled: Boolean,
     val index: Int?,
 ) {
     val isNewEntry = index == null
+    val isIpv6: Boolean = input.isIpv6()
+    val isLocal: Boolean = input.isLocalAddress()
 
     fun isValid() = validationError == null
+
+    private fun String.isLocalAddress(): Boolean {
+        return isValid() && InetAddress.getByName(this).isLocalAddress()
+    }
+
+    private fun String.isIpv6(): Boolean {
+        return isValid() && InetAddress.getByName(this) is Inet6Address
+    }
+
+    private fun InetAddress.isLocalAddress(): Boolean {
+        return isLinkLocalAddress || isSiteLocalAddress
+    }
 }
 
 sealed class ValidationError {
@@ -74,8 +86,6 @@ class DnsDialogViewModel(
                     input = input,
                     validationError =
                         input.validateDnsEntry(currentIndex, settings.addresses()).leftOrNull(),
-                    isLocal = input.isLocalAddress(),
-                    isIpv6 = input.isIpv6(),
                     isAllowLanEnabled = settings.allowLan,
                     isIpv6Enabled = settings.tunnelOptions.genericOptions.enableIpv6,
                     index = currentIndex,
@@ -87,8 +97,6 @@ class DnsDialogViewModel(
                 DnsDialogViewState(
                     input = _ipAddressInput.value,
                     validationError = null,
-                    isLocal = _ipAddressInput.value.isLocalAddress(),
-                    isIpv6 = _ipAddressInput.value.isIpv6(),
                     isAllowLanEnabled = false,
                     isIpv6Enabled = false,
                     index = null,
@@ -153,18 +161,6 @@ class DnsDialogViewModel(
         return inetAddressValidator.isValid(this)
     }
 
-    private fun String.isLocalAddress(): Boolean {
-        return isValidIp() && InetAddress.getByName(this).isLocalAddress()
-    }
-
-    private fun String.isIpv6(): Boolean {
-        return isValidIp() && InetAddress.getByName(this) is Inet6Address
-    }
-
-    private fun InetAddress.isLocalAddress(): Boolean {
-        return isLinkLocalAddress || isSiteLocalAddress
-    }
-
     private fun InetAddress.isDuplicateDnsEntry(
         currentIndex: Int? = null,
         dnsList: List<InetAddress>,

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt

@@ -255,9 +255,9 @@ class VpnSettingsViewModel(
         }
     }
 
-    fun setIpV6Enabled(enable: Boolean) {
+    fun setIpv6Enabled(enable: Boolean) {
         viewModelScope.launch(dispatcher) {
-            repository.setIpV6Enabled(enable).onLeft {
+            repository.setIpv6Enabled(enable).onLeft {
                 _uiSideEffect.send(VpnSettingsSideEffect.ShowToast.GenericError)
             }
         }