diff options
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 432ed5cbbc..8ecfd86d4b 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -1,9 +1,8 @@ use crate::daemon_interface; -use ipnetwork::IpNetwork; use jnix::{ jni::{ objects::{AutoLocal, JList, JObject, JValue}, - sys::{jboolean, jint, jshort}, + sys::{jboolean, jint}, }, JnixEnv, }; @@ -20,7 +19,7 @@ use mullvad_types::{ }; use std::{ fmt::Debug, - net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr}, + net::{Ipv4Addr, Ipv6Addr, SocketAddr}, }; use talpid_core::tunnel::tun_provider::TunConfig; use talpid_types::{ @@ -108,33 +107,10 @@ where } } -wrap_jnix_into_java!(IpAddr); wrap_jnix_into_java!(Ipv4Addr); wrap_jnix_into_java!(Ipv6Addr); wrap_jnix_into_java!(SocketAddr); -impl<'borrow, 'env> IntoJava<'borrow, 'env> for IpNetwork -where - 'env: 'borrow, -{ - type JavaType = AutoLocal<'env, 'borrow>; - - fn into_java(self, env: &'borrow JnixEnv<'env>) -> Self::JavaType { - let class = env.get_class("net/mullvad/talpid/tun_provider/InetNetwork"); - let address = self.ip().into_java(env); - let prefix_length = self.prefix() as jshort; - let parameters = [ - JValue::Object(address.as_obj()), - JValue::Short(prefix_length), - ]; - - env.auto_local( - env.new_object(&class, "(Ljava/net/InetAddress;S)V", ¶meters) - .expect("Failed to create InetNetwork Java object"), - ) - } -} - impl<'borrow, 'env> IntoJava<'borrow, 'env> for PublicKey where 'env: 'borrow, |