diff options
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt) | 3 | ||||
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 10 | ||||
| -rw-r--r-- | mullvad-jni/src/lib.rs | 2 |
5 files changed, 8 insertions, 11 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt index 1fbcd9c7c2..9278bb315f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LocationInfo.kt @@ -3,9 +3,9 @@ package net.mullvad.mullvadvpn import android.content.Context import android.view.View import android.widget.TextView -import net.mullvad.mullvadvpn.model.Endpoint import net.mullvad.mullvadvpn.model.GeoIpLocation import net.mullvad.mullvadvpn.model.TunnelState +import net.mullvad.talpid.net.Endpoint import net.mullvad.talpid.net.TransportProtocol class LocationInfo(val parentView: View, val context: Context) { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt index f064218215..1a07824cb7 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelEndpoint.kt @@ -1,3 +1,5 @@ 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/Endpoint.kt b/android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt index 32b41e5051..7baeb66161 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/Endpoint.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/net/Endpoint.kt @@ -1,6 +1,5 @@ -package net.mullvad.mullvadvpn.model +package net.mullvad.talpid.net import java.net.InetSocketAddress -import net.mullvad.talpid.net.TransportProtocol data class Endpoint(val address: InetSocketAddress, val protocol: TransportProtocol) 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", |