diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-22 01:47:22 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-22 15:16:55 +0000 |
| commit | 387e3ec710a8ef532b1a64f4707c1160bfe003b6 (patch) | |
| tree | 49e67bc0d281580dd4a574e0b8024f3837c56e52 /android/src | |
| parent | b250716fbec76057556efd69e827243a557bd897 (diff) | |
| download | mullvadvpn-387e3ec710a8ef532b1a64f4707c1160bfe003b6.tar.xz mullvadvpn-387e3ec710a8ef532b1a64f4707c1160bfe003b6.zip | |
Derive `IntoJava` for `ParameterGenerationError`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt | 8 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt index b37cf81819..f6fd4c9e1e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt @@ -179,12 +179,12 @@ class NotificationBanner( is BlockReason.TapAdapterProblem -> R.string.tap_adapter_problem is BlockReason.ParameterGeneration -> { when (reason.error) { - is ParameterGenerationError.NoMatchingRelay -> R.string.no_matching_relay - is ParameterGenerationError.NoMatchingBridgeRelay -> { + ParameterGenerationError.NoMatchingRelay -> R.string.no_matching_relay + ParameterGenerationError.NoMatchingBridgeRelay -> { R.string.no_matching_bridge_relay } - is ParameterGenerationError.NoWireguardKey -> R.string.no_wireguard_key - is ParameterGenerationError.CustomTunnelHostResultionError -> { + ParameterGenerationError.NoWireguardKey -> R.string.no_wireguard_key + ParameterGenerationError.CustomTunnelHostResultionError -> { R.string.custom_tunnel_host_resolution_error } } diff --git a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt index 92547a02b4..51fa8ac461 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ParameterGenerationError.kt @@ -1,8 +1,5 @@ package net.mullvad.talpid.tunnel -sealed class ParameterGenerationError { - class NoMatchingRelay : ParameterGenerationError() - class NoMatchingBridgeRelay : ParameterGenerationError() - class NoWireguardKey : ParameterGenerationError() - class CustomTunnelHostResultionError : ParameterGenerationError() +enum class ParameterGenerationError { + NoMatchingRelay, NoMatchingBridgeRelay, NoWireguardKey, CustomTunnelHostResultionError } |