summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-11-21 13:56:29 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-11-22 15:16:53 +0000
commitfe5ee8de5d9fa75c511e1706b447fe8e8ec13972 (patch)
treec3904678411ef583507aa5c4cd2c3327b3d222b3
parent2e6d090fd63b1424ca2be533eab97df8756c354e (diff)
downloadmullvadvpn-fe5ee8de5d9fa75c511e1706b447fe8e8ec13972.tar.xz
mullvadvpn-fe5ee8de5d9fa75c511e1706b447fe8e8ec13972.zip
Use `jnix::IntoJava` for `&[u8]`
-rw-r--r--mullvad-jni/src/into_java.rs14
1 files changed, 2 insertions, 12 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs
index 9f835b5b34..c2bc48d856 100644
--- a/mullvad-jni/src/into_java.rs
+++ b/mullvad-jni/src/into_java.rs
@@ -3,7 +3,7 @@ use ipnetwork::IpNetwork;
use jnix::{
jni::{
objects::{AutoLocal, JList, JObject, JValue},
- sys::{jboolean, jint, jshort, jsize},
+ sys::{jboolean, jint, jshort},
},
JnixEnv,
};
@@ -104,17 +104,7 @@ where
type JavaType = AutoLocal<'env, 'borrow>;
fn into_java(self, env: &'borrow JnixEnv<'env>) -> Self::JavaType {
- let size = self.len();
- let array = env
- .new_byte_array(size as jsize)
- .expect("Failed to create a Java array of bytes");
-
- let data = unsafe { std::slice::from_raw_parts(self.as_ptr() as *const i8, size) };
-
- env.set_byte_array_region(array, 0, data)
- .expect("Failed to copy bytes to Java array");
-
- env.auto_local(JObject::from(array))
+ jnix::IntoJava::into_java(self, env)
}
}