diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-03 21:45:28 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-20 13:42:41 +0000 |
| commit | 2f68eb768e830b94f186c7c87303cf55b11992ba (patch) | |
| tree | ce1d0ce51461944c0f2741e83895e94451e4a504 | |
| parent | 73194cb1aec1375f5e9ca13b294ed7ceef7172c3 (diff) | |
| download | mullvadvpn-2f68eb768e830b94f186c7c87303cf55b11992ba.tar.xz mullvadvpn-2f68eb768e830b94f186c7c87303cf55b11992ba.zip | |
Allow fragments to use the split tunnelling helper
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt index b2717fb1ec..43ecb29ae2 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt @@ -12,6 +12,7 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: val keyStatusListener = service.keyStatusListener val locationInfoCache = service.locationInfoCache val settingsListener = service.settingsListener + val splitTunnelling = service.splitTunnelling val appVersionInfoCache = AppVersionInfoCache(mainActivity, daemon, settingsListener) var relayListListener = RelayListListener(daemon, settingsListener) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt index 03dbd53f0d..29577058b8 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -13,6 +13,7 @@ import net.mullvad.mullvadvpn.service.KeyStatusListener import net.mullvad.mullvadvpn.service.LocationInfoCache import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.service.SettingsListener +import net.mullvad.mullvadvpn.service.SplitTunnelling import net.mullvad.talpid.ConnectivityListener abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceAwareFragment() { @@ -58,6 +59,8 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA lateinit var settingsListener: SettingsListener private set + lateinit var splitTunnelling: SplitTunnelling + override fun onNewServiceConnection(serviceConnection: ServiceConnection) { // This method is always either called first or after an `onNoServiceConnection`, so the // initialization of the fields doesn't have to be synchronized @@ -70,6 +73,7 @@ abstract class ServiceDependentFragment(val onNoService: OnNoService) : ServiceA locationInfoCache = serviceConnection.locationInfoCache relayListListener = serviceConnection.relayListListener settingsListener = serviceConnection.settingsListener + splitTunnelling = serviceConnection.splitTunnelling synchronized(this) { when (state) { |