Some fixes

Pururun · Pururun · commit 689083ea1297 · 2025-03-19T14:43:54.000+01:00
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
@@ -107,7 +107,7 @@ class VpnSettingsScreenTest {
                 navigateToUdp2TcpSettings = navigateToUdp2TcpSettings,
                 onToggleAutoStartAndConnectOnBoot = onToggleAutoStartAndConnectOnBoot,
                 onSelectDeviceIpVersion = onSelectDeviceIpVersion,
-                onToggleIPv6Toggle = onToggleIPv6Toggle,
+                onToggleIpv6Toggle = onToggleIPv6Toggle,
             )
         }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/DnsCell.kt
@@ -43,17 +43,15 @@ fun DnsCell(
     BaseCell(
         headlineContent = { DnsTitle(address = address, modifier = titleModifier) },
         bodyView = {
-            if (isUnreachableLocalDnsWarningVisible) {
+            if (isUnreachableLocalDnsWarningVisible || isUnreachableIpv6DnsWarningVisible) {
                 Icon(
                     imageVector = Icons.Rounded.Error,
-                    contentDescription = stringResource(id = R.string.confirm_local_dns),
-                    tint = MaterialTheme.colorScheme.error,
-                )
-            }
-            if (isUnreachableIpv6DnsWarningVisible) {
-                Icon(
-                    imageVector = Icons.Rounded.Error,
-                    contentDescription = stringResource(id = R.string.confirm_ipv6_dns),
+                    contentDescription =
+                        if (isUnreachableLocalDnsWarningVisible) {
+                            stringResource(id = R.string.confirm_local_dns)
+                        } else {
+                            stringResource(id = R.string.confirm_ipv6_dns)
+                        },
                     tint = MaterialTheme.colorScheme.error,
                 )
             }
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
@@ -142,7 +142,7 @@ private fun PreviewVpnSettings(
             navigateToWireguardPortDialog = {},
             navigateToServerIpOverrides = {},
             onSelectDeviceIpVersion = {},
-            onToggleIPv6Toggle = {},
+            onToggleIpv6Toggle = {},
         )
     }
 }
@@ -272,7 +272,7 @@ fun VpnSettings(
             dropUnlessResumed { navigator.navigate(Udp2TcpSettingsDestination) },
         onToggleAutoStartAndConnectOnBoot = vm::onToggleAutoStartAndConnectOnBoot,
         onSelectDeviceIpVersion = vm::onDeviceIpVersionSelected,
-        onToggleIPv6Toggle = vm::setIpV6Enabled,
+        onToggleIpv6Toggle = vm::setIpV6Enabled,
     )
 }
 
@@ -310,7 +310,7 @@ fun VpnSettingsScreen(
     navigateToUdp2TcpSettings: () -> Unit,
     onToggleAutoStartAndConnectOnBoot: (Boolean) -> Unit,
     onSelectDeviceIpVersion: (ipVersion: Constraint<IpVersion>) -> Unit,
-    onToggleIPv6Toggle: (Boolean) -> Unit,
+    onToggleIpv6Toggle: (Boolean) -> Unit,
 ) {
     var expandContentBlockersState by rememberSaveable { mutableStateOf(false) }
     val biggerPadding = 54.dp
@@ -470,7 +470,7 @@ fun VpnSettingsScreen(
                         address = item.address,
                         isUnreachableLocalDnsWarningVisible =
                             item.isLocal && !state.isLocalNetworkSharingEnabled,
-                        isUnreachableIpv6DnsWarningVisible = item.isIpv6 && !state.isIPv6Enabled,
+                        isUnreachableIpv6DnsWarningVisible = item.isIpv6 && !state.isIpv6Enabled,
                         onClick = { navigateToDns(index, item.address) },
                         modifier = Modifier.animateItem(),
                     )
@@ -685,21 +685,21 @@ fun VpnSettingsScreen(
                 Spacer(modifier = Modifier.height(Dimens.cellVerticalSpacing))
             }
 
-            item {
-                MtuComposeCell(mtuValue = state.mtu, onEditMtu = { navigateToMtuDialog(state.mtu) })
-            }
-            item { MtuSubtitle(modifier = Modifier.testTag(LAZY_LIST_LAST_ITEM_TEST_TAG)) }
-
             item {
                 HeaderSwitchComposeCell(
-                    title = "Enable IPv6",
-                    isToggled = state.isIPv6Enabled,
+                    title = stringResource(R.string.enable_ipv6),
+                    isToggled = state.isIpv6Enabled,
                     isEnabled = true,
-                    onCellClicked = { newValue -> onToggleIPv6Toggle(newValue) },
+                    onCellClicked = { newValue -> onToggleIpv6Toggle(newValue) },
                 )
                 Spacer(modifier = Modifier.height(Dimens.cellVerticalSpacing))
             }
 
+            item {
+                MtuComposeCell(mtuValue = state.mtu, onEditMtu = { navigateToMtuDialog(state.mtu) })
+            }
+            item { MtuSubtitle(modifier = Modifier.testTag(LAZY_LIST_LAST_ITEM_TEST_TAG)) }
+
             item { ServerIpOverrides(navigateToServerIpOverrides) }
         }
     }
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
@@ -26,7 +26,7 @@ data class VpnSettingsUiState(
     val systemVpnSettingsAvailable: Boolean,
     val autoStartAndConnectOnBoot: Boolean,
     val deviceIpVersion: Constraint<IpVersion>,
-    val isIPv6Enabled: Boolean,
+    val isIpv6Enabled: Boolean,
 ) {
     val isCustomWireguardPort =
         selectedWireguardPort is Constraint.Only &&
@@ -52,7 +52,7 @@ data class VpnSettingsUiState(
             systemVpnSettingsAvailable: Boolean = false,
             autoStartAndConnectOnBoot: Boolean = false,
             deviceIpVersion: Constraint<IpVersion> = Constraint.Any,
-            isIPv6Enabled: Boolean = true,
+            isIpv6Enabled: Boolean = true,
         ) =
             VpnSettingsUiState(
                 mtu,
@@ -70,7 +70,7 @@ data class VpnSettingsUiState(
                 systemVpnSettingsAvailable,
                 autoStartAndConnectOnBoot,
                 deviceIpVersion,
-                isIPv6Enabled,
+                isIpv6Enabled,
             )
     }
 }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DnsDialogViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/DnsDialogViewModel.kt
@@ -70,23 +70,28 @@ class DnsDialogViewModel(
                 input,
                 currentIndex,
                 settings ->
-                createViewState(
-                    settings.addresses(),
-                    currentIndex,
-                    settings.allowLan,
-                    settings.tunnelOptions.genericOptions.enableIpv6,
-                    input,
+                DnsDialogViewState(
+                    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,
                 )
             }
             .stateIn(
                 viewModelScope,
                 SharingStarted.Lazily,
-                createViewState(
-                    customDnsList = emptyList(),
-                    currentIndex = null,
+                DnsDialogViewState(
+                    input = _ipAddressInput.value,
+                    validationError = null,
+                    isLocal = _ipAddressInput.value.isLocalAddress(),
+                    isIpv6 = _ipAddressInput.value.isIpv6(),
                     isAllowLanEnabled = false,
                     isIpv6Enabled = false,
-                    input = _ipAddressInput.value,
+                    index = null,
                 ),
             )
 
@@ -97,23 +102,6 @@ class DnsDialogViewModel(
         viewModelScope.launch { settings.emit(repository.settingsUpdates.filterNotNull().first()) }
     }
 
-    private fun createViewState(
-        customDnsList: List<InetAddress>,
-        currentIndex: Int?,
-        isAllowLanEnabled: Boolean,
-        isIpv6Enabled: Boolean,
-        input: String,
-    ): DnsDialogViewState =
-        DnsDialogViewState(
-            input = input,
-            validationError = input.validateDnsEntry(currentIndex, customDnsList).leftOrNull(),
-            isLocal = input.isLocalAddress(),
-            isIpv6 = input.isIpv6(),
-            isAllowLanEnabled = isAllowLanEnabled,
-            isIpv6Enabled = isIpv6Enabled,
-            index = currentIndex,
-        )
-
     private fun String.validateDnsEntry(
         index: Int?,
         dnsList: List<InetAddress>,
diff --git a/android/lib/resource/src/main/res/values-da/strings.xml b/android/lib/resource/src/main/res/values-da/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Aktivér alligevel</string>
     <string name="enable_custom_dns">Brug brugerdefineret DNS-server</string>
     <string name="enable_direct_only">Aktivér %1$s</string>
+    <string name="enable_ipv6">Aktiver IPv6</string>
     <string name="enable_method">Aktiver metode</string>
     <string name="encrypted_dns_proxy_info_message_part1">Med metoden \"krypteret DNS-proxy\" vil appen kommunikere med vores Mullvad API via en proxy-adresse. Det gør den ved at hente en adresse fra en DNS over HTTPS-server (DoH) og derefter bruge den til at få adgang til en vores API-servere.</string>
     <string name="enter_value_placeholder">Indtast MTU</string>
diff --git a/android/lib/resource/src/main/res/values-de/strings.xml b/android/lib/resource/src/main/res/values-de/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Trotzdem aktivieren</string>
     <string name="enable_custom_dns">Benutzerdefinierten DNS-Server verwenden</string>
     <string name="enable_direct_only">%1$s aktivieren</string>
+    <string name="enable_ipv6">IPv6 aktivieren</string>
     <string name="enable_method">Methode aktivieren</string>
     <string name="encrypted_dns_proxy_info_message_part1">Mit der Methode „Verschlüsseltes-DNS-Proxy“ kommuniziert die App mit unserer Mullvad-API über eine Proxy-Adresse. Sie tut dies, indem sie eine Adresse von einem DNS-over-HTTPS-Server (DoH) abruft und dann diese verwendet, um unsere API-Server zu erreichen.</string>
     <string name="enter_value_placeholder">MTU eingeben</string>
diff --git a/android/lib/resource/src/main/res/values-es/strings.xml b/android/lib/resource/src/main/res/values-es/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Habilitar de todos modos</string>
     <string name="enable_custom_dns">Usar servidor DNS personalizado</string>
     <string name="enable_direct_only">Habilitar %1$s</string>
+    <string name="enable_ipv6">Habilitar IPv6</string>
     <string name="enable_method">Habilitar método</string>
     <string name="encrypted_dns_proxy_info_message_part1">Con el método «Proxy DNS cifrado», la aplicación se comunicará con nuestra API de Mullvad a través de una dirección proxy. Para ello, recupera una dirección de un servidor DNS sobre HTTPS (DoH) y luego la utiliza para contactar con nuestros servidores API.</string>
     <string name="enter_value_placeholder">Introducir MTU</string>
diff --git a/android/lib/resource/src/main/res/values-fi/strings.xml b/android/lib/resource/src/main/res/values-fi/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Ota silti käyttöön</string>
     <string name="enable_custom_dns">Käytä mukautettua DNS-palvelinta</string>
     <string name="enable_direct_only">Ota %1$s käyttöön</string>
+    <string name="enable_ipv6">Salli IPv6</string>
     <string name="enable_method">Ota menetelmä käyttöön</string>
     <string name="encrypted_dns_proxy_info_message_part1">Sovellus kommunikoi Mullvad API:n kanssa välityspalvelinosoitteen kautta \"Salattu DNS-välityspalvelin\" -menetelmällä, joka toimii niin, että sovellus hakee osoitteen DNS over HTTPS (DoH) -palvelimelta ja käyttää sitä API-palvelimillemme pääsemiseen.</string>
     <string name="enter_value_placeholder">Syötä MTU</string>
diff --git a/android/lib/resource/src/main/res/values-fr/strings.xml b/android/lib/resource/src/main/res/values-fr/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Activer quand même</string>
     <string name="enable_custom_dns">Utiliser un serveur DNS personnalisé</string>
     <string name="enable_direct_only">Activer %1$s</string>
+    <string name="enable_ipv6">Activer IPv6</string>
     <string name="enable_method">Activer la méthode</string>
     <string name="encrypted_dns_proxy_info_message_part1">Avec la méthode « proxy DNS chiffré », l\'application communiquera avec notre API Mullvad par le biais d\'une adresse proxy. Pour ce faire, elle récupère une adresse auprès d\'un serveur DNS over HTTPS (DoH) et l\'utilise pour atteindre nos serveurs API.</string>
     <string name="enter_value_placeholder">Saisir le MTU</string>
diff --git a/android/lib/resource/src/main/res/values-it/strings.xml b/android/lib/resource/src/main/res/values-it/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Abilita comunque</string>
     <string name="enable_custom_dns">Usa un server DNS personalizzato</string>
     <string name="enable_direct_only">Abilita %1$s</string>
+    <string name="enable_ipv6">Abilita IPv6</string>
     <string name="enable_method">Abilita metodo</string>
     <string name="encrypted_dns_proxy_info_message_part1">Con il metodo \"Proxy DNS crittografato\", l\'app comunicherà con la nostra API Mullvad tramite un indirizzo proxy. Lo fa recuperando un indirizzo da un server DNS over HTTPS (DoH) e quindi utilizzandolo per raggiungere i nostri server API.</string>
     <string name="enter_value_placeholder">Inserisci MTU</string>
diff --git a/android/lib/resource/src/main/res/values-ja/strings.xml b/android/lib/resource/src/main/res/values-ja/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">それでも有効にする</string>
     <string name="enable_custom_dns">カスタムDNSサーバーを使う</string>
     <string name="enable_direct_only">%1$sを有効にする</string>
+    <string name="enable_ipv6">IPv6を有効にする</string>
     <string name="enable_method">方法を有効化する</string>
     <string name="encrypted_dns_proxy_info_message_part1">[暗号化DNSプロキシ] 方式を使用すると、アプリはプロキシアドレスを通じてMullvad APIと通信します。これはDNS over HTTPS (DoH) サーバーからアドレスを取得し、APIサーバーへのアクセスに利用することで行われます。</string>
     <string name="enter_value_placeholder">MTU を入力</string>
diff --git a/android/lib/resource/src/main/res/values-ko/strings.xml b/android/lib/resource/src/main/res/values-ko/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">그래도 사용</string>
     <string name="enable_custom_dns">사용자 지정 DNS 서버 사용</string>
     <string name="enable_direct_only">%1$s 활성화</string>
+    <string name="enable_ipv6">IPv6 사용</string>
     <string name="enable_method">방법 활성화</string>
     <string name="encrypted_dns_proxy_info_message_part1">앱은 \"암호화된 DNS 프록시\" 방식을 사용하여 프록시 주소를 통해 Mullvad API와 통신합니다. 이는 DoH(DNS over HTTPS) 서버에서 주소를 검색한 다음, 그 주소를 사용해 당사 API 서버에 도달하는 방식으로 이루어집니다.</string>
     <string name="enter_value_placeholder">MTU 입력</string>
diff --git a/android/lib/resource/src/main/res/values-my/strings.xml b/android/lib/resource/src/main/res/values-my/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">မည်သို့ပင်ဖြစ်စေ ဖွင့်ရန်</string>
     <string name="enable_custom_dns">စိတ်ကြိုက် DNS ဆာဗာကို သုံးရန်</string>
     <string name="enable_direct_only">%1$s ကို ဖွင့်ရန်</string>
+    <string name="enable_ipv6">IPv6 ကို ဖွင့်ရန်</string>
     <string name="enable_method">နည်းလမ်းကို ဖွင့်ရန်</string>
     <string name="encrypted_dns_proxy_info_message_part1">ထိုအက်ပ်သည် “ကုဒ်ဝှက်ထားသော DNS ပရောက်စီ” နည်းလမ်းအားဖြင့် ကျွန်ုပ်တို့၏ Mullvad API ထံသို့ ပရောက်စီလိပ်စာမှတစ်ဆင့် ဆက်သွယ်ပေးမည်ဖြစ်သည်။ HTTPS (DoH) ဆာဗာရှိ DNS မှ လိပ်စာတစ်ခုကို ပြန်လည်ရယူခြင်းအားဖြင့် ထိုသို့လုပ်ဆောင်ပြီးနောက် ကျွန်ုပ်တို့၏ API ဆာဗာများသို့ရောက်ရှိရန် ၎င်းကို အသုံးပြုသည်။</string>
     <string name="enter_value_placeholder">MTU ကို ရိုက်ထည့်ရန်</string>
diff --git a/android/lib/resource/src/main/res/values-nb/strings.xml b/android/lib/resource/src/main/res/values-nb/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Aktiver uansett</string>
     <string name="enable_custom_dns">Bruk egendefinert DNS-server</string>
     <string name="enable_direct_only">Aktiver %1$s</string>
+    <string name="enable_ipv6">Aktiver IPv6</string>
     <string name="enable_method">Aktiver metoden</string>
     <string name="encrypted_dns_proxy_info_message_part1">Med metoden «Kryptert DNS-proxy» vil appen kommunisere med Mullvad API gjennom en proxy-adresse. Dette gjøres ved å hente en adresse fra en DNS over HTTPS-server (DoH) og deretter bruke den til å nå API-serverne våre.</string>
     <string name="enter_value_placeholder">Angi MTU</string>
diff --git a/android/lib/resource/src/main/res/values-nl/strings.xml b/android/lib/resource/src/main/res/values-nl/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Toch inschakelen</string>
     <string name="enable_custom_dns">Aangepaste DNS-server gebruiken</string>
     <string name="enable_direct_only">%1$s inschakelen</string>
+    <string name="enable_ipv6">IPv6 inschakelen</string>
     <string name="enable_method">Methode inschakelen</string>
     <string name="encrypted_dns_proxy_info_message_part1">Met de methode \"Versleutelde DNS-proxy\" communiceert de app met onze Mullvad-API via een proxyadres. De app doet dit door een adres op te halen van een DoH-server (DNS over HTTPS) en dat te gebruiken om onze API-servers te bereiken.</string>
     <string name="enter_value_placeholder">Voer MTU in</string>
diff --git a/android/lib/resource/src/main/res/values-pl/strings.xml b/android/lib/resource/src/main/res/values-pl/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Mimo to włącz</string>
     <string name="enable_custom_dns">Użyj niestandardowego serwera DNS</string>
     <string name="enable_direct_only">Włącz %1$s</string>
+    <string name="enable_ipv6">Włącz IPv6</string>
     <string name="enable_method">Włącz metodę</string>
     <string name="encrypted_dns_proxy_info_message_part1">Dzięki metodzie „szyfrowany serwer proxy DNS” aplikacja będzie komunikować się z naszym interfejsem API Mullvad za pośrednictwem adresu serwera proxy. Odbywa się to poprzez pobranie adresu z serwera DNS over HTTPS (DoH), a następnie użycie go do połączenia z naszymi serwerami interfejsu API.</string>
     <string name="enter_value_placeholder">Wprowadź MTU</string>
diff --git a/android/lib/resource/src/main/res/values-pt/strings.xml b/android/lib/resource/src/main/res/values-pt/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Ativar mesmo assim</string>
     <string name="enable_custom_dns">Usar servidor DNS personalizado</string>
     <string name="enable_direct_only">Ativar %1$s</string>
+    <string name="enable_ipv6">Ativar IPv6</string>
     <string name="enable_method">Ativar método</string>
     <string name="encrypted_dns_proxy_info_message_part1">Com o método \"Proxy DNS encriptado\", a aplicação irá comunicar com a nossa API Mullvad através de um endereço proxy. Para tal, obtém um endereço de um servidor DNS sobre HTTPS (DoH) e utiliza-o para aceder aos nossos servidores de API.</string>
     <string name="enter_value_placeholder">Introduzir MTU</string>
diff --git a/android/lib/resource/src/main/res/values-ru/strings.xml b/android/lib/resource/src/main/res/values-ru/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Всё равно включить</string>
     <string name="enable_custom_dns">Пользовательский DNS-сервер</string>
     <string name="enable_direct_only">Включить параметр «%1$s»</string>
+    <string name="enable_ipv6">Включить IPv6</string>
     <string name="enable_method">Включить метод</string>
     <string name="encrypted_dns_proxy_info_message_part1">При использовании метода «Прокси через зашифрованный DNS» приложение будет взаимодействовать с API Mullvad через прокси-адрес. Полученный от сервера «DNS по HTTPS» (DoH) адрес будет использоваться для доступа к нашим серверам API.</string>
     <string name="enter_value_placeholder">Введите MTU</string>
diff --git a/android/lib/resource/src/main/res/values-sv/strings.xml b/android/lib/resource/src/main/res/values-sv/strings.xml
@@ -154,6 +154,7 @@
     <string name="enable_anyway">Aktivera ändå</string>
     <string name="enable_custom_dns">Använd anpassad DNS-server</string>
     <string name="enable_direct_only">Aktivera %1$s</string>
+    <string name="enable_ipv6">Aktivera IPv6</string>
     <string name="enable_method">Aktivera metod</string>
     <string name="encrypted_dns_proxy_info_message_part1">Med metoden \"Krypterad DNS-proxy\" kommunicerar appen med vår Mullvad API via en proxyadress. Den gör det genom att hämta en adress från en DNS over HTTPS-server (DoH) och sedan använda den för att nå våra API-servrar.</string>
     <string name="enter_value_placeholder">Ange MTU</string>
diff --git a/android/lib/resource/src/main/res/values-th/strings.xml b/android/lib/resource/src/main/res/values-th/strings.xml
diff --git a/android/lib/resource/src/main/res/values-tr/strings.xml b/android/lib/resource/src/main/res/values-tr/strings.xml
diff --git a/android/lib/resource/src/main/res/values-zh-rCN/strings.xml b/android/lib/resource/src/main/res/values-zh-rCN/strings.xml
diff --git a/android/lib/resource/src/main/res/values-zh-rTW/strings.xml b/android/lib/resource/src/main/res/values-zh-rTW/strings.xml
diff --git a/android/lib/resource/src/main/res/values/strings.xml b/android/lib/resource/src/main/res/values/strings.xml
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/UnderlyingConnectivityStatusResolver.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/util/UnderlyingConnectivityStatusResolver.kt

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ class VpnSettingsScreenTest {`
`107`	`107`	`navigateToUdp2TcpSettings = navigateToUdp2TcpSettings,`
`108`	`108`	`onToggleAutoStartAndConnectOnBoot = onToggleAutoStartAndConnectOnBoot,`
`109`	`109`	`onSelectDeviceIpVersion = onSelectDeviceIpVersion,`
`110`		`- onToggleIPv6Toggle = onToggleIPv6Toggle,`
	`110`	`+ onToggleIpv6Toggle = onToggleIPv6Toggle,`
`111`	`111`	`)`
`112`	`112`	`}`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ private fun PreviewVpnSettings(`
`142`	`142`	`navigateToWireguardPortDialog = {},`
`143`	`143`	`navigateToServerIpOverrides = {},`
`144`	`144`	`onSelectDeviceIpVersion = {},`
`145`		`- onToggleIPv6Toggle = {},`
	`145`	`+ onToggleIpv6Toggle = {},`
`146`	`146`	`)`
`147`	`147`	`}`
`148`	`148`	`}`
`@@ -272,7 +272,7 @@ fun VpnSettings(`
`272`	`272`	`dropUnlessResumed { navigator.navigate(Udp2TcpSettingsDestination) },`
`273`	`273`	`onToggleAutoStartAndConnectOnBoot = vm::onToggleAutoStartAndConnectOnBoot,`
`274`	`274`	`onSelectDeviceIpVersion = vm::onDeviceIpVersionSelected,`
`275`		`- onToggleIPv6Toggle = vm::setIpV6Enabled,`
	`275`	`+ onToggleIpv6Toggle = vm::setIpV6Enabled,`
`276`	`276`	`)`
`277`	`277`	`}`
`278`	`278`
`@@ -310,7 +310,7 @@ fun VpnSettingsScreen(`
`310`	`310`	`navigateToUdp2TcpSettings: () -> Unit,`
`311`	`311`	`onToggleAutoStartAndConnectOnBoot: (Boolean) -> Unit,`
`312`	`312`	`onSelectDeviceIpVersion: (ipVersion: Constraint<IpVersion>) -> Unit,`
`313`		`- onToggleIPv6Toggle: (Boolean) -> Unit,`
	`313`	`+ onToggleIpv6Toggle: (Boolean) -> Unit,`
`314`	`314`	`) {`
`315`	`315`	`var expandContentBlockersState by rememberSaveable { mutableStateOf(false) }`
`316`	`316`	`val biggerPadding = 54.dp`
`@@ -470,7 +470,7 @@ fun VpnSettingsScreen(`
`470`	`470`	`address = item.address,`
`471`	`471`	`isUnreachableLocalDnsWarningVisible =`
`472`	`472`	`item.isLocal && !state.isLocalNetworkSharingEnabled,`
`473`		`- isUnreachableIpv6DnsWarningVisible = item.isIpv6 && !state.isIPv6Enabled,`
	`473`	`+ isUnreachableIpv6DnsWarningVisible = item.isIpv6 && !state.isIpv6Enabled,`
`474`	`474`	`onClick = { navigateToDns(index, item.address) },`
`475`	`475`	`modifier = Modifier.animateItem(),`
`476`	`476`	`)`
`@@ -685,21 +685,21 @@ fun VpnSettingsScreen(`
`685`	`685`	`Spacer(modifier = Modifier.height(Dimens.cellVerticalSpacing))`
`686`	`686`	`}`
`687`	`687`
`688`		`- item {`
`689`		`- MtuComposeCell(mtuValue = state.mtu, onEditMtu = { navigateToMtuDialog(state.mtu) })`
`690`		`- }`
`691`		`- item { MtuSubtitle(modifier = Modifier.testTag(LAZY_LIST_LAST_ITEM_TEST_TAG)) }`
`692`		`-`
`693`	`688`	`item {`
`694`	`689`	`HeaderSwitchComposeCell(`
`695`		`- title = "Enable IPv6",`
`696`		`- isToggled = state.isIPv6Enabled,`
	`690`	`+ title = stringResource(R.string.enable_ipv6),`
	`691`	`+ isToggled = state.isIpv6Enabled,`
`697`	`692`	`isEnabled = true,`
`698`		`- onCellClicked = { newValue -> onToggleIPv6Toggle(newValue) },`
	`693`	`+ onCellClicked = { newValue -> onToggleIpv6Toggle(newValue) },`
`699`	`694`	`)`
`700`	`695`	`Spacer(modifier = Modifier.height(Dimens.cellVerticalSpacing))`
`701`	`696`	`}`
`702`	`697`
	`698`	`+ item {`
	`699`	`+ MtuComposeCell(mtuValue = state.mtu, onEditMtu = { navigateToMtuDialog(state.mtu) })`
	`700`	`+ }`
	`701`	`+ item { MtuSubtitle(modifier = Modifier.testTag(LAZY_LIST_LAST_ITEM_TEST_TAG)) }`
	`702`	`+`
`703`	`703`	`item { ServerIpOverrides(navigateToServerIpOverrides) }`
`704`	`704`	`}`
`705`	`705`	`}`