diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-03 21:43:15 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-20 13:42:41 +0000 |
| commit | 73194cb1aec1375f5e9ca13b294ed7ceef7172c3 (patch) | |
| tree | 935e30097484d5a807c195fe54455276658048a3 /android/src | |
| parent | cca57d1e177a0f8b6a3312d1bda777bae1e78a15 (diff) | |
| download | mullvadvpn-73194cb1aec1375f5e9ca13b294ed7ceef7172c3.tar.xz mullvadvpn-73194cb1aec1375f5e9ca13b294ed7ceef7172c3.zip | |
Add split tunnelling to `MullvadVpnService`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 12 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt | 3 |
2 files changed, 13 insertions, 2 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 edc0cfd21b..a1ed2987f5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -242,7 +242,17 @@ class MullvadVpnService : TalpidVpnService() { pendingAction = null } - instance = ServiceInstance(daemon, connectionProxy, connectivityListener, settingsListener) + val splitTunnelling = SplitTunnelling().apply { + onChange = { excludedApps -> disallowedApps = excludedApps } + } + + instance = ServiceInstance( + daemon, + connectionProxy, + connectivityListener, + settingsListener, + splitTunnelling + ) } private fun stop() { 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 273955bcef..ecca6b12f0 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt @@ -6,7 +6,8 @@ class ServiceInstance( val daemon: MullvadDaemon, val connectionProxy: ConnectionProxy, val connectivityListener: ConnectivityListener, - val settingsListener: SettingsListener + val settingsListener: SettingsListener, + val splitTunnelling: SplitTunnelling ) { val accountCache = AccountCache(daemon, settingsListener) val keyStatusListener = KeyStatusListener(daemon) |