summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-08-24 14:19:55 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-08-24 14:19:55 -0300
commit67b8753c91f96e16ad2283278a08eb50c4305d9d (patch)
tree1e954996a744e547f75c1a81d755cdf36db9483f /android/src
parent01675e6c6a478ca430ba96abdb2c4a42f5c4f1f6 (diff)
parent1ce6dbdf87abb7eb4e5679f7bdfe5e43f7900c8a (diff)
downloadmullvadvpn-67b8753c91f96e16ad2283278a08eb50c4305d9d.tar.xz
mullvadvpn-67b8753c91f96e16ad2283278a08eb50c4305d9d.zip
Merge branch 'fix-exclude-applications-header-not-shown'
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt6
1 files changed, 6 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt
index 9bce3cb620..ac0cb8631b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnellingFragment.kt
@@ -119,6 +119,12 @@ class SplitTunnellingFragment : ServiceDependentFragment(OnNoService.GoToLaunchS
}
}
+ if (splitTunnelling.enabled) {
+ jobTracker.newUiJob("showExcludedApplications") {
+ excludeApplications.visibility = View.VISIBLE
+ }
+ }
+
enabledToggle = header.findViewById<ToggleCell>(R.id.enabled).apply {
if (splitTunnelling.enabled) {
forcefullySetState(CellSwitch.State.ON)