summaryrefslogtreecommitdiffhomepage
path: root/mullvad-jni/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-11-21 09:42:59 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-11-22 15:16:53 +0000
commit2e6d090fd63b1424ca2be533eab97df8756c354e (patch)
tree5d4dd58dd702828c26b44031a877030a22a5fdce /mullvad-jni/src
parent63977a8ae56429139349a464caa825431b855077 (diff)
downloadmullvadvpn-2e6d090fd63b1424ca2be533eab97df8756c354e.tar.xz
mullvadvpn-2e6d090fd63b1424ca2be533eab97df8756c354e.zip
Use `jnix::IntoJava` for `SocketAddr`
Diffstat (limited to 'mullvad-jni/src')
-rw-r--r--mullvad-jni/src/into_java.rs20
1 files changed, 1 insertions, 19 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs
index bf50bc3b26..9f835b5b34 100644
--- a/mullvad-jni/src/into_java.rs
+++ b/mullvad-jni/src/into_java.rs
@@ -121,25 +121,7 @@ where
wrap_jnix_into_java!(IpAddr);
wrap_jnix_into_java!(Ipv4Addr);
wrap_jnix_into_java!(Ipv6Addr);
-
-impl<'borrow, 'env> IntoJava<'borrow, 'env> for SocketAddr
-where
- 'env: 'borrow,
-{
- type JavaType = AutoLocal<'env, 'borrow>;
-
- fn into_java(self, env: &'borrow JnixEnv<'env>) -> Self::JavaType {
- let class = env.get_class("java/net/InetSocketAddress");
- let ip_address = self.ip().into_java(env);
- let port = self.port() as jint;
- let parameters = [JValue::Object(ip_address.as_obj()), JValue::Int(port)];
-
- env.auto_local(
- env.new_object(&class, "(Ljava/net/InetAddress;I)V", &parameters)
- .expect("Failed to create InetSocketAddress Java object"),
- )
- }
-}
+wrap_jnix_into_java!(SocketAddr);
impl<'borrow, 'env> IntoJava<'borrow, 'env> for IpNetwork
where