diff options
| author | Albin <albin@mullvad.net> | 2023-11-17 15:00:00 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-11-17 15:00:00 +0100 |
| commit | e45003f1197b7c34c9c3b99f36d52319140af4fb (patch) | |
| tree | f5c90eda4490b7af27e21a0a8b69e1a0f76b9dd3 /android/lib/model/src | |
| parent | 8620efdb28c6863b40408862211ee690004526e5 (diff) | |
| parent | 679cb9144355c3fbd05f5af3341e9c8eeb2d2c42 (diff) | |
| download | mullvadvpn-e45003f1197b7c34c9c3b99f36d52319140af4fb.tar.xz mullvadvpn-e45003f1197b7c34c9c3b99f36d52319140af4fb.zip | |
Merge branch 'crash-when-getting-firewall-policy-error-droid-505'
Diffstat (limited to 'android/lib/model/src')
| -rw-r--r-- | android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt index 364c8861ce..26f776b223 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt @@ -6,6 +6,7 @@ import net.mullvad.talpid.net.TunnelEndpoint import net.mullvad.talpid.tunnel.ActionAfterDisconnect import net.mullvad.talpid.tunnel.ErrorState import net.mullvad.talpid.tunnel.ErrorStateCause +import net.mullvad.talpid.tunnel.FirewallPolicyError sealed class TunnelState : Parcelable { @Parcelize object Disconnected : TunnelState(), Parcelable @@ -73,9 +74,20 @@ sealed class TunnelState : Parcelable { DISCONNECTING -> Disconnecting(ActionAfterDisconnect.Nothing) BLOCKING -> Error(ErrorState(ErrorStateCause.StartTunnelError, true)) ERROR -> { - Error(ErrorState(ErrorStateCause.SetFirewallPolicyError, false)) + Error( + ErrorState( + ErrorStateCause.SetFirewallPolicyError(FirewallPolicyError.Generic), + false + ) + ) } - else -> Error(ErrorState(ErrorStateCause.SetFirewallPolicyError, false)) + else -> + Error( + ErrorState( + ErrorStateCause.SetFirewallPolicyError(FirewallPolicyError.Generic), + false + ) + ) } } } |