diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-31 08:06:35 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-31 11:55:29 +0000 |
| commit | 3378afa27e881249b76acdd67aeabe0614632299 (patch) | |
| tree | ca514d06ccdda469f35741820ca4a6caeefc55c2 | |
| parent | 36e9e1c08204be1ffad5c618ffd59d0a61062e14 (diff) | |
| download | mullvadvpn-3378afa27e881249b76acdd67aeabe0614632299.tar.xz mullvadvpn-3378afa27e881249b76acdd67aeabe0614632299.zip | |
Add `BlockReason` to `TunnelState.Blocked` class
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt | 2 | ||||
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 4 |
2 files changed, 4 insertions, 2 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 b08e75e3e8..054a07ed4d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt @@ -5,5 +5,5 @@ sealed class TunnelState() { class Connecting(val location: GeoIpLocation?) : TunnelState() class Connected(val location: GeoIpLocation?) : TunnelState() class Disconnecting(val actionAfterDisconnect: ActionAfterDisconnect) : TunnelState() - class Blocked() : TunnelState() + class Blocked(val reason: BlockReason) : TunnelState() } diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 0731cf5ce6..fe668f1580 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -593,7 +593,9 @@ impl<'env> IntoJava<'env> for TunnelState { "ActionAfterDisconnect", )), ), - TunnelState::Blocked(_) => ("Blocked", None), + TunnelState::Blocked(reason) => { + ("Blocked", Some((reason.into_java(env), "BlockReason"))) + } }; let class = get_class(&format!( |