diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-11 22:13:27 +0000 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-09-13 11:29:04 +0200 |
| commit | fc9d19bda0a1c2eeee71f80f2614903629123b99 (patch) | |
| tree | 2328c4812f0a54da752b1418b5c36b7910ec9d45 | |
| parent | 4c5cc66fe0fc59d399225b7f2eff199785f94fa1 (diff) | |
| download | mullvadvpn-fc9d19bda0a1c2eeee71f80f2614903629123b99.tar.xz mullvadvpn-fc9d19bda0a1c2eeee71f80f2614903629123b99.zip | |
Add `active` property to `Relay` model class
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt | 2 | ||||
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt index 4173af782b..b5d582e18d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Relay.kt @@ -1,4 +1,4 @@ package net.mullvad.mullvadvpn.model -data class Relay(val hostname: String, val hasWireguardTunnels: Boolean) { +data class Relay(val hostname: String, val hasWireguardTunnels: Boolean, val active: Boolean) { } diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 1e46973c32..2354ce0656 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -436,9 +436,10 @@ impl<'env> IntoJava<'env> for Relay { let parameters = [ JValue::Object(hostname.as_obj()), JValue::Bool(has_wireguard_tunnels), + JValue::Bool(self.active as jboolean), ]; - env.new_object(&class, "(Ljava/lang/String;Z)V", ¶meters) + env.new_object(&class, "(Ljava/lang/String;ZZ)V", ¶meters) .expect("Failed to create Relay Java object") } } |
