diff options
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt | 8 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt | 50 |
2 files changed, 9 insertions, 49 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt index 34fa8b9248..dc5698b17a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt @@ -28,13 +28,11 @@ sealed class TunnelState() { CONNECTED -> TunnelState.Connected(endpoint!!, null) RECONNECTING -> TunnelState.Disconnecting(ActionAfterDisconnect.Reconnect) DISCONNECTING -> TunnelState.Disconnecting(ActionAfterDisconnect.Nothing) - BLOCKING -> TunnelState.Error(ErrorState(ErrorStateCause.StartTunnelError(), true)) + BLOCKING -> TunnelState.Error(ErrorState(ErrorStateCause.StartTunnelError, true)) ERROR -> { - TunnelState.Error(ErrorState(ErrorStateCause.SetFirewallPolicyError(), false)) - } - else -> { - TunnelState.Error(ErrorState(ErrorStateCause.SetFirewallPolicyError(), false)) + TunnelState.Error(ErrorState(ErrorStateCause.SetFirewallPolicyError, false)) } + else -> TunnelState.Error(ErrorState(ErrorStateCause.SetFirewallPolicyError, false)) } } } 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 2ae5684d55..8aa14dae1c 100644 --- a/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tunnel/ErrorStateCause.kt @@ -4,50 +4,12 @@ import java.net.InetAddress sealed class ErrorStateCause { class AuthFailed(val reason: String?) : ErrorStateCause() - - class Ipv6Unavailable : ErrorStateCause() { - companion object { - @JvmStatic - val INSTANCE = Ipv6Unavailable() - } - } - - class SetFirewallPolicyError : ErrorStateCause() { - companion object { - @JvmStatic - val INSTANCE = SetFirewallPolicyError() - } - } - - class SetDnsError : ErrorStateCause() { - companion object { - @JvmStatic - val INSTANCE = SetDnsError() - } - } - + object Ipv6Unavailable : ErrorStateCause() + object SetFirewallPolicyError : ErrorStateCause() + object SetDnsError : ErrorStateCause() class InvalidDnsServers(val addresses: ArrayList<InetAddress>) : ErrorStateCause() - - class StartTunnelError : ErrorStateCause() { - companion object { - @JvmStatic - val INSTANCE = StartTunnelError() - } - } - + object StartTunnelError : ErrorStateCause() class TunnelParameterError(val error: ParameterGenerationError) : ErrorStateCause() - - class IsOffline : ErrorStateCause() { - companion object { - @JvmStatic - val INSTANCE = IsOffline() - } - } - - class VpnPermissionDenied : ErrorStateCause() { - companion object { - @JvmStatic - val INSTANCE = VpnPermissionDenied() - } - } + object IsOffline : ErrorStateCause() + object VpnPermissionDenied : ErrorStateCause() } |