diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-11-25 12:56:37 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-11-25 12:56:37 +0100 |
| commit | 2233e4af385102d60f2f828ccbf03b8a1080c44d (patch) | |
| tree | 88042513ee3764cc7e38c23b3d973e39380ebd8b /android | |
| parent | cb814e5a467d929d989b5499dd54f779c09d67e1 (diff) | |
| parent | 0757bc984980568a00f91ed84698aebb4152c629 (diff) | |
| download | mullvadvpn-2233e4af385102d60f2f828ccbf03b8a1080c44d.tar.xz mullvadvpn-2233e4af385102d60f2f828ccbf03b8a1080c44d.zip | |
Merge branch 'android-fix-error-state-cause'
Diffstat (limited to 'android')
3 files changed, 3 insertions, 3 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 7c86abd113..1f04a081d9 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 @@ -63,7 +63,7 @@ class TunnelStateNotification( is ErrorStateCause.SetDnsError -> R.string.set_dns_error is ErrorStateCause.StartTunnelError -> R.string.start_tunnel_error is ErrorStateCause.IsOffline -> R.string.is_offline - is ErrorStateCause.TapAdapterProblem -> R.string.tap_adapter_problem + is ErrorStateCause.VirtualAdapterProblem -> R.string.virtual_adapter_problem is ErrorStateCause.TunnelParameterError -> { when (cause.error) { ParameterGenerationError.NoMatchingRelay -> R.string.no_matching_relay diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt index d35d0a428b..1448984ec6 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt @@ -8,6 +8,6 @@ sealed class ErrorStateCause { class StartTunnelError : ErrorStateCause() class TunnelParameterError(val error: ParameterGenerationError) : ErrorStateCause() class IsOffline : ErrorStateCause() - class TapAdapterProblem : ErrorStateCause() + class VirtualAdapterProblem : ErrorStateCause() class VpnPermissionDenied : ErrorStateCause() } diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 9cb46d6790..37d0747cb3 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -128,7 +128,7 @@ <string name="custom_tunnel_host_resolution_error">Failed to resolve the hostname of custom server</string> <string name="is_offline">This device is offline, no tunnels can be established</string> - <string name="tap_adapter_problem">TAP adapter error</string> + <string name="virtual_adapter_problem">Virtual adapter error</string> <string name="wireguard_error">WireGuard error</string> <string name="too_many_keys">Too many WireGuard keys registered to account</string> <string name="failed_to_generate_key">Failed to generate a key</string> |