diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 11:10:58 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 12:54:33 +0000 |
| commit | cc2dfc6ff796c34813f6b1855e8a95a54e76b7ce (patch) | |
| tree | 40745712bd6e8c6ffe82e45fce6c148d75e6bded | |
| parent | c5c2541dad73044d58ffdc671a469241f0e3c257 (diff) | |
| download | mullvadvpn-cc2dfc6ff796c34813f6b1855e8a95a54e76b7ce.tar.xz mullvadvpn-cc2dfc6ff796c34813f6b1855e8a95a54e76b7ce.zip | |
Move `InetNetwork` to Talpid package
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunConfig.kt | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/InetNetwork.kt) | 2 | ||||
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 2 | ||||
| -rw-r--r-- | mullvad-jni/src/lib.rs | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunConfig.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunConfig.kt index 929e03b99a..bbbbf4b904 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunConfig.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunConfig.kt @@ -1,6 +1,7 @@ package net.mullvad.mullvadvpn.model import java.net.InetAddress +import net.mullvad.talpid.tun_provider.InetNetwork data class TunConfig( val addresses: List<InetAddress>, diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/InetNetwork.kt b/android/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt index eb3030880f..9b133d352b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/InetNetwork.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tun_provider/InetNetwork.kt @@ -1,4 +1,4 @@ -package net.mullvad.mullvadvpn.model +package net.mullvad.talpid.tun_provider import java.net.InetAddress diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 602022bc00..63068e37aa 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -189,7 +189,7 @@ impl<'env> IntoJava<'env> for IpNetwork { type JavaType = JObject<'env>; fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType { - let class = get_class("net/mullvad/mullvadvpn/model/InetNetwork"); + let class = get_class("net/mullvad/talpid/tun_provider/InetNetwork"); let address = env.auto_local(self.ip().into_java(env)); let prefix_length = self.prefix() as jshort; let parameters = [ diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index 146c14e8e6..f54e2833ac 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -43,7 +43,6 @@ const CLASSES_TO_LOAD: &[&str] = &[ "net/mullvad/mullvadvpn/model/GetAccountDataResult$InvalidAccount", "net/mullvad/mullvadvpn/model/GetAccountDataResult$RpcError", "net/mullvad/mullvadvpn/model/GetAccountDataResult$OtherError", - "net/mullvad/mullvadvpn/model/InetNetwork", "net/mullvad/mullvadvpn/model/KeygenEvent$NewKey", "net/mullvad/mullvadvpn/model/KeygenEvent$Failure", "net/mullvad/mullvadvpn/model/KeygenFailure$TooManyKeys", @@ -73,6 +72,7 @@ const CLASSES_TO_LOAD: &[&str] = &[ "net/mullvad/talpid/net/TransportProtocol$Tcp", "net/mullvad/talpid/net/TransportProtocol$Udp", "net/mullvad/talpid/net/TunnelEndpoint", + "net/mullvad/talpid/tun_provider/InetNetwork", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Block", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Nothing", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Reconnect", |