diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-30 12:37:47 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-06-10 21:42:32 +0000 |
| commit | a35e33dd985e22f479a374d05c1c6bc94a53740d (patch) | |
| tree | 1b46f1b6246382406a3082c1b234a1d77341a00b | |
| parent | a265fc596b7b2fca79592b494d6e3a55034bfbe2 (diff) | |
| download | mullvadvpn-a35e33dd985e22f479a374d05c1c6bc94a53740d.tar.xz mullvadvpn-a35e33dd985e22f479a374d05c1c6bc94a53740d.zip | |
Fix `IntoJava` implementation for `TunConfig`
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 1ab7cd54e6..06116d8c3b 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -196,10 +196,22 @@ impl<'env> IntoJava<'env> for TunConfig { fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType { let class = get_class("net/mullvad/mullvadvpn/model/TunConfig"); let addresses = env.auto_local(self.addresses.into_java(env)); - let parameters = [JValue::Object(addresses.as_obj())]; + let dns_servers = env.auto_local(self.dns_servers.into_java(env)); + let routes = env.auto_local(self.routes.into_java(env)); + let mtu = self.mtu as jint; + let parameters = [ + JValue::Object(addresses.as_obj()), + JValue::Object(dns_servers.as_obj()), + JValue::Object(routes.as_obj()), + JValue::Int(mtu), + ]; - env.new_object(&class, "(Ljava/util/List;)V", ¶meters) - .expect("Failed to create TunConfig Java object") + env.new_object( + &class, + "(Ljava/util/List;Ljava/util/List;Ljava/util/List;I)V", + ¶meters, + ) + .expect("Failed to create TunConfig Java object") } } |
