summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-11-21 15:19:25 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-11-22 15:16:54 +0000
commitd279b9d660cdac65b45d7b5e05a9795f797317dc (patch)
tree87b5f37bb7e97759e52380db318ea87dca235519
parent7d97d483fdaf5165fbe923f82ebafd6b8ebd084c (diff)
downloadmullvadvpn-d279b9d660cdac65b45d7b5e05a9795f797317dc.tar.xz
mullvadvpn-d279b9d660cdac65b45d7b5e05a9795f797317dc.zip
Remove obsoleted `IntoJava` impl. for `IpNetwork`
-rw-r--r--mullvad-jni/src/into_java.rs28
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", &parameters)
- .expect("Failed to create InetNetwork Java object"),
- )
- }
-}
-
impl<'borrow, 'env> IntoJava<'borrow, 'env> for PublicKey
where
'env: 'borrow,