summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-12-18 15:35:09 +0000
committerAleksandr Granin <aleksandr@mullvad.net>2021-04-08 13:26:19 +0200
commit5cfd3a7bb5c9503da5f3d55726212085d4a28e79 (patch)
tree8dd5f99c8f38f1cdd9862812cf8049b777914c37 /android
parenta74f982e7d6f65c264babc059d2a3cd2475668dc (diff)
downloadmullvadvpn-5cfd3a7bb5c9503da5f3d55726212085d4a28e79.tar.xz
mullvadvpn-5cfd3a7bb5c9503da5f3d55726212085d4a28e79.zip
Remove split tunneling from `ServiceInstance`
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt3
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt2
2 files changed, 1 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 920e51c9d1..5ffeb31f84 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -246,8 +246,7 @@ class MullvadVpnService : TalpidVpnService() {
daemon,
daemonInstance.intermittentDaemon,
connectionProxy,
- customDns,
- endpoint.splitTunneling
+ customDns
)
}
}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt
index f1c58dda67..f97d8c870f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt
@@ -1,7 +1,6 @@
package net.mullvad.mullvadvpn.service
import android.os.Messenger
-import net.mullvad.mullvadvpn.service.endpoint.SplitTunneling
import net.mullvad.mullvadvpn.util.Intermittent
class ServiceInstance(
@@ -10,7 +9,6 @@ class ServiceInstance(
val intermittentDaemon: Intermittent<MullvadDaemon>,
val connectionProxy: ConnectionProxy,
val customDns: CustomDns,
- val splitTunneling: SplitTunneling
) {
fun onDestroy() {
connectionProxy.onDestroy()