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 /android/src/main | |
| parent | cc2dfc6ff796c34813f6b1855e8a95a54e76b7ce (diff) | |
| download | mullvadvpn-40d3b7634aff71b89fc89a8f6082a01a5c61630f.tar.xz mullvadvpn-40d3b7634aff71b89fc89a8f6082a01a5c61630f.zip | |
Move `TunConfig` to Talpid package
Diffstat (limited to 'android/src/main')
| -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 |
2 files changed, 2 insertions, 3 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>, |