diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-22 19:39:20 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-23 10:30:24 +0000 |
| commit | 964635fa85310e00c7dbff6f2f34b571c823c9eb (patch) | |
| tree | 26b65fc6cbfa1e5473b3c275c01e3328ac99df06 | |
| parent | 669bcacd7a590fbfb13dc9eafe443d86895b567f (diff) | |
| download | mullvadvpn-964635fa85310e00c7dbff6f2f34b571c823c9eb.tar.xz mullvadvpn-964635fa85310e00c7dbff6f2f34b571c823c9eb.zip | |
Implement `FromJava` for `RelayConstraintsUpdate`
| -rw-r--r-- | mullvad-jni/src/from_java.rs | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/mullvad-jni/src/from_java.rs b/mullvad-jni/src/from_java.rs index 8ef615242e..dde51cc74a 100644 --- a/mullvad-jni/src/from_java.rs +++ b/mullvad-jni/src/from_java.rs @@ -3,7 +3,7 @@ use jni::{ objects::{JObject, JString}, JNIEnv, }; -use mullvad_types::relay_constraints::{Constraint, LocationConstraint}; +use mullvad_types::relay_constraints::{Constraint, LocationConstraint, RelayConstraintsUpdate}; use std::fmt::Debug; pub trait FromJava<'env> { @@ -95,6 +95,24 @@ impl<'env> FromJava<'env> for LocationConstraint { } } +impl<'env> FromJava<'env> for RelayConstraintsUpdate { + type JavaType = JObject<'env>; + + fn from_java(env: &JNIEnv<'env>, source: Self::JavaType) -> Self { + let location = get_object_field( + env, + source, + "location", + "Lnet/mullvad/mullvadvpn/model/Constraint;", + ); + + RelayConstraintsUpdate { + location: FromJava::from_java(env, location), + tunnel: None, + } + } +} + fn is_instance_of<'env>( env: &JNIEnv<'env>, object: JObject<'env>, |
