diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-18 15:11:01 +0000 |
|---|---|---|
| committer | Aleksandr Granin <aleksandr@mullvad.net> | 2021-04-08 13:26:19 +0200 |
| commit | 959d41c00ec12bb45586f15b70ef9a3499a12db2 (patch) | |
| tree | ff55e925d4ce8ca556c1fc4587e9016431f083ba /android/src | |
| parent | cf8317bcf14ec823c1f57f975838a55afa5e939b (diff) | |
| download | mullvadvpn-959d41c00ec12bb45586f15b70ef9a3499a12db2.tar.xz mullvadvpn-959d41c00ec12bb45586f15b70ef9a3499a12db2.zip | |
Use `null` to indicate split tunneling is disabled
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt | 4 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt index 21b19a6124..2dfecf678d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/SplitTunneling.kt @@ -21,14 +21,14 @@ class SplitTunneling(context: Context, endpoint: ServiceEndpoint) { get() = if (enabled) { excludedApps.toList() } else { - emptyList() + null } var enabled by observable(preferences.getBoolean(KEY_ENABLED, false)) { _, _, _ -> enabledChanged() } - var onChange by observable<((List<String>) -> Unit)?>(null) { _, _, _ -> + var onChange by observable<((List<String>?) -> Unit)?>(null) { _, _, _ -> update() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt index c2a50dd3b9..7eda34092f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModel.kt @@ -92,7 +92,7 @@ class SplitTunnelingViewModel( private suspend fun fetchData() { appsProvider.getAppsList() - .partition { app -> splitTunneling.excludedAppList.contains(app.packageName) } + .partition { app -> splitTunneling.excludedAppList?.contains(app.packageName) ?: false } .let { (excludedAppsList, notExcludedAppsList) -> // TODO: remove potential package names from splitTunneling list // if they already uninstalled or filtered; but not in ViewModel |