diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-21 21:18:09 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-16 12:36:00 +0000 |
| commit | 8f166356bccf13b5c90c7fa7db2644e328f7bc9d (patch) | |
| tree | 85ce2de26e6ec1bf30c26112569a99e7b58d583e /android/src | |
| parent | 0e46ee247195a3db4b09c1f333e5942b2b9c330c (diff) | |
| download | mullvadvpn-8f166356bccf13b5c90c7fa7db2644e328f7bc9d.tar.xz mullvadvpn-8f166356bccf13b5c90c7fa7db2644e328f7bc9d.zip | |
Improve error message for invalid DNS server addr.
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt | 9 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt index 6db3cf2ffd..80ae9da5e4 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt @@ -8,6 +8,7 @@ import net.mullvad.talpid.tunnel.ActionAfterDisconnect import net.mullvad.talpid.tunnel.ErrorState import net.mullvad.talpid.tunnel.ErrorStateCause import net.mullvad.talpid.tunnel.ParameterGenerationError +import net.mullvad.talpid.util.addressString class TunnelStateNotification( private val context: Context, @@ -67,11 +68,17 @@ class TunnelStateNotification( private fun blockingErrorMessage(cause: ErrorStateCause): String { val messageId = when (cause) { + is ErrorStateCause.InvalidDnsServers -> { + val addresses = cause.addresses + .map { address -> address.addressString() } + .joinToString() + + return context.getString(R.string.invalid_dns_servers, addresses) + } is ErrorStateCause.AuthFailed -> R.string.auth_failed is ErrorStateCause.Ipv6Unavailable -> R.string.ipv6_unavailable is ErrorStateCause.SetFirewallPolicyError -> R.string.set_firewall_policy_error is ErrorStateCause.SetDnsError -> R.string.set_dns_error - is ErrorStateCause.InvalidDnsServers -> R.string.set_dns_error is ErrorStateCause.StartTunnelError -> R.string.start_tunnel_error is ErrorStateCause.IsOffline -> R.string.is_offline is ErrorStateCause.TunnelParameterError -> { diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index fbb8182bf4..720a406465 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -118,6 +118,7 @@ <string name="set_firewall_policy_error">Failed to apply firewall rules. The device might currently be unsecured</string> <string name="set_dns_error">Failed to set system DNS server</string> + <string name="invalid_dns_servers">Custom DNS server addresses %1$s are invalid</string> <string name="start_tunnel_error">Failed to start tunnel connection</string> <string name="vpn_permission_denied_error">VPN permission was denied when creating the tunnel. Please try connecting again.</string> |