diff options
| author | Emīls <emils@mullvad.net> | 2019-11-28 13:27:09 +0000 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2019-11-28 13:36:22 +0000 |
| commit | 1281839d5a16eba30ee5d6a233ca0af695d9c095 (patch) | |
| tree | 4a97494c63e2f47337187f28883118a5fd98c3d9 | |
| parent | 9a940d0fa083f28141680e717132ff78d8933084 (diff) | |
| download | mullvadvpn-1281839d5a16eba30ee5d6a233ca0af695d9c095.tar.xz mullvadvpn-1281839d5a16eba30ee5d6a233ca0af695d9c095.zip | |
Fix tunnel parameter error mismatch
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt | 2 | ||||
| -rw-r--r-- | mullvad-jni/src/classes.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt index 495a62c387..ff6330d975 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt @@ -172,7 +172,7 @@ class NotificationBanner( is BlockReason.StartTunnelError -> R.string.start_tunnel_error is BlockReason.IsOffline -> R.string.is_offline is BlockReason.TapAdapterProblem -> R.string.tap_adapter_problem - is BlockReason.ParameterGeneration -> { + is BlockReason.TunnelParameterError -> { when (reason.error) { ParameterGenerationError.NoMatchingRelay -> R.string.no_matching_relay ParameterGenerationError.NoMatchingBridgeRelay -> { diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt index 758e81dfba..bed6177fb0 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/BlockReason.kt @@ -6,7 +6,7 @@ sealed class BlockReason { class SetFirewallPolicyError : BlockReason() class SetDnsError : BlockReason() class StartTunnelError : BlockReason() - class ParameterGeneration(val error: ParameterGenerationError) : BlockReason() + class TunnelParameterError(val error: ParameterGenerationError) : BlockReason() class IsOffline : BlockReason() class TapAdapterProblem : BlockReason() } diff --git a/mullvad-jni/src/classes.rs b/mullvad-jni/src/classes.rs index b568c46c3d..17bbe99522 100644 --- a/mullvad-jni/src/classes.rs +++ b/mullvad-jni/src/classes.rs @@ -49,7 +49,7 @@ pub const CLASSES: &[&str] = &[ "net/mullvad/talpid/tunnel/BlockReason$SetFirewallPolicyError", "net/mullvad/talpid/tunnel/BlockReason$SetDnsError", "net/mullvad/talpid/tunnel/BlockReason$StartTunnelError", - "net/mullvad/talpid/tunnel/BlockReason$ParameterGeneration", + "net/mullvad/talpid/tunnel/BlockReason$TunnelParameterError", "net/mullvad/talpid/tunnel/BlockReason$IsOffline", "net/mullvad/talpid/tunnel/BlockReason$TapAdapterProblem", "net/mullvad/talpid/tunnel/ParameterGenerationError", |