diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 10:49:38 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 12:54:33 +0000 |
| commit | 7292fa593e2fc441da58786b37fedf4f0a929a86 (patch) | |
| tree | 13302a29c47eef15746caf771e3838ff83866299 /mullvad-jni/src | |
| parent | 1b655d7a0b9b864ddc07eb59e381338fb437927e (diff) | |
| download | mullvadvpn-7292fa593e2fc441da58786b37fedf4f0a929a86.tar.xz mullvadvpn-7292fa593e2fc441da58786b37fedf4f0a929a86.zip | |
Move `Endpoint` to Talpid package
Diffstat (limited to 'mullvad-jni/src')
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 10 | ||||
| -rw-r--r-- | mullvad-jni/src/lib.rs | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index eb68dcdced..a82739af12 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -301,7 +301,7 @@ impl<'env> IntoJava<'env> for Endpoint { type JavaType = JObject<'env>; fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType { - let class = get_class("net/mullvad/mullvadvpn/model/Endpoint"); + let class = get_class("net/mullvad/talpid/net/Endpoint"); let address = env.auto_local(self.address.into_java(env)); let protocol = env.auto_local(self.protocol.into_java(env)); let parameters = [ @@ -326,12 +326,8 @@ impl<'env> IntoJava<'env> for TunnelEndpoint { let endpoint = env.auto_local(self.endpoint.into_java(env)); let parameters = [JValue::Object(endpoint.as_obj())]; - env.new_object( - &class, - "(Lnet/mullvad/mullvadvpn/model/Endpoint;)V", - ¶meters, - ) - .expect("Failed to create TunnelEndpoint sub-class variant Java object") + env.new_object(&class, "(Lnet/mullvad/talpid/net/Endpoint;)V", ¶meters) + .expect("Failed to create TunnelEndpoint sub-class variant Java object") } } diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index b69a71b60d..34fbd5ef4a 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -38,7 +38,6 @@ const CLASSES_TO_LOAD: &[&str] = &[ "net/mullvad/mullvadvpn/model/AppVersionInfo", "net/mullvad/mullvadvpn/model/Constraint$Any", "net/mullvad/mullvadvpn/model/Constraint$Only", - "net/mullvad/mullvadvpn/model/Endpoint", "net/mullvad/mullvadvpn/model/GeoIpLocation", "net/mullvad/mullvadvpn/model/GetAccountDataResult$Ok", "net/mullvad/mullvadvpn/model/GetAccountDataResult$InvalidAccount", @@ -71,6 +70,7 @@ const CLASSES_TO_LOAD: &[&str] = &[ "net/mullvad/mullvadvpn/model/TunnelState$Disconnecting", "net/mullvad/mullvadvpn/MullvadDaemon", "net/mullvad/mullvadvpn/MullvadVpnService", + "net/mullvad/talpid/net/Endpoint", "net/mullvad/talpid/net/TransportProtocol$Tcp", "net/mullvad/talpid/net/TransportProtocol$Udp", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Block", |