diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-12-03 11:33:46 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-12-03 11:33:46 +0100 |
| commit | c1d99182ab2acaf2432de0992f835dcffa6e3aef (patch) | |
| tree | 6c2ac92f469f59bd48ca93bcbe7656d8115c4e3c /android/src | |
| parent | 4687159fa1f32fab1a42bfea4a5c47f53554ba0a (diff) | |
| parent | a51c84e78beeb3eb7e6e2c6f89f6889b70f5a9da (diff) | |
| download | mullvadvpn-c1d99182ab2acaf2432de0992f835dcffa6e3aef.tar.xz mullvadvpn-c1d99182ab2acaf2432de0992f835dcffa6e3aef.zip | |
Merge branch 'share-wintun-adapter'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/TunnelStateNotification.kt | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt | 1 |
2 files changed, 0 insertions, 2 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 1f04a081d9..d352b3fc2a 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,6 @@ 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.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 1448984ec6..e65f70be63 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,5 @@ sealed class ErrorStateCause { class StartTunnelError : ErrorStateCause() class TunnelParameterError(val error: ParameterGenerationError) : ErrorStateCause() class IsOffline : ErrorStateCause() - class VirtualAdapterProblem : ErrorStateCause() class VpnPermissionDenied : ErrorStateCause() } |