diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 10:53:10 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 12:54:33 +0000 |
| commit | c5c2541dad73044d58ffdc671a469241f0e3c257 (patch) | |
| tree | 8f74d6ef980770c890d08a2649b9b9356d7b5afe | |
| parent | 7292fa593e2fc441da58786b37fedf4f0a929a86 (diff) | |
| download | mullvadvpn-c5c2541dad73044d58ffdc671a469241f0e3c257.tar.xz mullvadvpn-c5c2541dad73044d58ffdc671a469241f0e3c257.zip | |
Move `TunnelEndpoint` to Talpid package
5 files changed, 8 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt deleted file mode 100644 index 1a07824cb7..0000000000 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt +++ /dev/null @@ -1,5 +0,0 @@ -package net.mullvad.mullvadvpn.model - -import net.mullvad.talpid.net.Endpoint - -data class TunnelEndpoint(val endpoint: Endpoint) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt index c91497ce03..040c4997c9 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelState.kt @@ -1,5 +1,6 @@ package net.mullvad.mullvadvpn.model +import net.mullvad.talpid.net.TunnelEndpoint import net.mullvad.talpid.tunnel.ActionAfterDisconnect import net.mullvad.talpid.tunnel.BlockReason diff --git a/android/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt b/android/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt new file mode 100644 index 0000000000..138ab57cc6 --- /dev/null +++ b/android/src/main/kotlin/net/mullvad/talpid/net/TunnelEndpoint.kt @@ -0,0 +1,3 @@ +package net.mullvad.talpid.net + +data class TunnelEndpoint(val endpoint: Endpoint) diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index a82739af12..602022bc00 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -322,7 +322,7 @@ impl<'env> IntoJava<'env> for TunnelEndpoint { type JavaType = JObject<'env>; fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType { - let class = get_class("net/mullvad/mullvadvpn/model/TunnelEndpoint"); + let class = get_class("net/mullvad/talpid/net/TunnelEndpoint"); let endpoint = env.auto_local(self.endpoint.into_java(env)); let parameters = [JValue::Object(endpoint.as_obj())]; @@ -732,7 +732,7 @@ impl<'env> IntoJava<'env> for TunnelState { JValue::Object(location.as_obj()), ]; let signature = - "(Lnet/mullvad/mullvadvpn/model/TunnelEndpoint;Lnet/mullvad/mullvadvpn/model/GeoIpLocation;)V"; + "(Lnet/mullvad/talpid/net/TunnelEndpoint;Lnet/mullvad/mullvadvpn/model/GeoIpLocation;)V"; env.new_object(&class, signature, ¶meters) } @@ -745,7 +745,7 @@ impl<'env> IntoJava<'env> for TunnelState { JValue::Object(location.as_obj()), ]; let signature = - "(Lnet/mullvad/mullvadvpn/model/TunnelEndpoint;Lnet/mullvad/mullvadvpn/model/GeoIpLocation;)V"; + "(Lnet/mullvad/talpid/net/TunnelEndpoint;Lnet/mullvad/mullvadvpn/model/GeoIpLocation;)V"; env.new_object(&class, signature, ¶meters) } diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index 34fbd5ef4a..146c14e8e6 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -62,7 +62,6 @@ const CLASSES_TO_LOAD: &[&str] = &[ "net/mullvad/mullvadvpn/model/RelaySettingsUpdate$RelayConstraintsUpdate", "net/mullvad/mullvadvpn/model/Settings", "net/mullvad/mullvadvpn/model/TunConfig", - "net/mullvad/mullvadvpn/model/TunnelEndpoint", "net/mullvad/mullvadvpn/model/TunnelState$Blocked", "net/mullvad/mullvadvpn/model/TunnelState$Connected", "net/mullvad/mullvadvpn/model/TunnelState$Connecting", @@ -73,6 +72,7 @@ const CLASSES_TO_LOAD: &[&str] = &[ "net/mullvad/talpid/net/Endpoint", "net/mullvad/talpid/net/TransportProtocol$Tcp", "net/mullvad/talpid/net/TransportProtocol$Udp", + "net/mullvad/talpid/net/TunnelEndpoint", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Block", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Nothing", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Reconnect", |