diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 11:12:51 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-11-21 12:54:33 +0000 |
| commit | 40d3b7634aff71b89fc89a8f6082a01a5c61630f (patch) | |
| tree | 8824585655653dfc37294c8d4bad411a8ec70f5c | |
| parent | cc2dfc6ff796c34813f6b1855e8a95a54e76b7ce (diff) | |
| download | mullvadvpn-40d3b7634aff71b89fc89a8f6082a01a5c61630f.tar.xz mullvadvpn-40d3b7634aff71b89fc89a8f6082a01a5c61630f.zip | |
Move `TunConfig` to Talpid package
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt (renamed from android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunConfig.kt) | 3 | ||||
| -rw-r--r-- | mullvad-jni/src/into_java.rs | 2 | ||||
| -rw-r--r-- | mullvad-jni/src/lib.rs | 2 | ||||
| -rw-r--r-- | mullvad-jni/src/vpn_service_tun_provider.rs | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt index 388e4c0a5d..174387eabb 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt @@ -11,7 +11,7 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import kotlinx.coroutines.runBlocking import net.mullvad.mullvadvpn.dataproxy.ConnectionProxy -import net.mullvad.mullvadvpn.model.TunConfig +import net.mullvad.talpid.tun_provider.TunConfig class MullvadVpnService : VpnService() { private val binder = LocalBinder() diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunConfig.kt b/android/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt index bbbbf4b904..fe8d0f55c7 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunConfig.kt +++ b/android/src/main/kotlin/net/mullvad/talpid/tun_provider/TunConfig.kt @@ -1,7 +1,6 @@ -package net.mullvad.mullvadvpn.model +package net.mullvad.talpid.tun_provider import java.net.InetAddress -import net.mullvad.talpid.tun_provider.InetNetwork data class TunConfig( val addresses: List<InetAddress>, diff --git a/mullvad-jni/src/into_java.rs b/mullvad-jni/src/into_java.rs index 63068e37aa..bc97ac4bc0 100644 --- a/mullvad-jni/src/into_java.rs +++ b/mullvad-jni/src/into_java.rs @@ -261,7 +261,7 @@ impl<'env> IntoJava<'env> for TunConfig { type JavaType = JObject<'env>; fn into_java(self, env: &JNIEnv<'env>) -> Self::JavaType { - let class = get_class("net/mullvad/mullvadvpn/model/TunConfig"); + let class = get_class("net/mullvad/talpid/tun_provider/TunConfig"); let addresses = env.auto_local(self.addresses.into_java(env)); let dns_servers = env.auto_local(self.dns_servers.into_java(env)); let routes = env.auto_local(self.routes.into_java(env)); diff --git a/mullvad-jni/src/lib.rs b/mullvad-jni/src/lib.rs index f54e2833ac..33bd4095ee 100644 --- a/mullvad-jni/src/lib.rs +++ b/mullvad-jni/src/lib.rs @@ -60,7 +60,6 @@ const CLASSES_TO_LOAD: &[&str] = &[ "net/mullvad/mullvadvpn/model/RelaySettingsUpdate$CustomTunnelEndpoint", "net/mullvad/mullvadvpn/model/RelaySettingsUpdate$RelayConstraintsUpdate", "net/mullvad/mullvadvpn/model/Settings", - "net/mullvad/mullvadvpn/model/TunConfig", "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/TransportProtocol$Udp", "net/mullvad/talpid/net/TunnelEndpoint", "net/mullvad/talpid/tun_provider/InetNetwork", + "net/mullvad/talpid/tun_provider/TunConfig", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Block", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Nothing", "net/mullvad/talpid/tunnel/ActionAfterDisconnect$Reconnect", diff --git a/mullvad-jni/src/vpn_service_tun_provider.rs b/mullvad-jni/src/vpn_service_tun_provider.rs index 68021ac8cd..54045c5da6 100644 --- a/mullvad-jni/src/vpn_service_tun_provider.rs +++ b/mullvad-jni/src/vpn_service_tun_provider.rs @@ -111,7 +111,7 @@ impl VpnServiceTunProvider { .get_method_id( &self.class, "createTun", - "(Lnet/mullvad/mullvadvpn/model/TunConfig;)I", + "(Lnet/mullvad/talpid/tun_provider/TunConfig;)I", ) .map_err(|cause| Error::FindMethod("createTun", cause))?; |