Update Split tunneling description

2 files changed, 10 insertions, 10 deletions

diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt
index 89f1a58f7a..04b88ce3b5 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreenTest.kt
@@ -40,7 +40,7 @@ class SplitTunnelingScreenTest {
 
             // Assert
             onNodeWithText(TITLE).assertExists()
-            onNodeWithText(DESCRIPTION).assertExists()
+            onNodeWithText(DESCRIPTION, substring = true).assertExists()
             onNodeWithText(EXCLUDED_APPLICATIONS).assertDoesNotExist()
             onNodeWithText(SHOW_SYSTEM_APPS).assertDoesNotExist()
             onNodeWithText(ALL_APPLICATIONS).assertDoesNotExist()
@@ -76,7 +76,7 @@ class SplitTunnelingScreenTest {
 
             // Assert
             onNodeWithText(TITLE).assertExists()
-            onNodeWithText(DESCRIPTION).assertExists()
+            onNodeWithText(DESCRIPTION, substring = true).assertExists()
             onNodeWithText(EXCLUDED_APPLICATIONS).assertExists()
             onNodeWithText(EXCLUDED_APP_NAME).assertExists()
             onNodeWithText(SHOW_SYSTEM_APPS).assertExists()
@@ -108,7 +108,7 @@ class SplitTunnelingScreenTest {
 
             // Assert
             onNodeWithText(TITLE).assertExists()
-            onNodeWithText(DESCRIPTION).assertExists()
+            onNodeWithText(DESCRIPTION, substring = true).assertExists()
             onNodeWithText(EXCLUDED_APPLICATIONS).assertDoesNotExist()
             onNodeWithText(EXCLUDED_APP_NAME).assertDoesNotExist()
             onNodeWithText(SHOW_SYSTEM_APPS).assertExists()
@@ -233,7 +233,8 @@ class SplitTunnelingScreenTest {
         private const val INCLUDED_APP_PACKAGE_NAME = "included-pkg"
         private const val INCLUDED_APP_NAME = "Included Name"
         private const val TITLE = "Split tunneling"
-        private const val DESCRIPTION = "Choose the apps you want to exclude from the VPN tunnel."
+        private const val DESCRIPTION =
+            "Lets you select apps that should access the Internet directly without going through the VPN tunnel."
         private const val EXCLUDED_APPLICATIONS = "Excluded applications"
         private const val SHOW_SYSTEM_APPS = "Show system apps"
         private const val ALL_APPLICATIONS = "All applications"
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
index 29aca2b3b4..c355eb6405 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SplitTunnelingScreen.kt
@@ -126,8 +126,8 @@ fun SplitTunnelingScreen(
             horizontalAlignment = Alignment.CenterHorizontally,
             state = lazyListState
         ) {
+            description()
             enabledToggle(enabled = state.enabled, onEnableSplitTunneling = onEnableSplitTunneling)
-            description(enabled = state.enabled)
             spacer()
             when (state) {
                 is SplitTunnelingUiState.Loading -> {
@@ -161,14 +161,13 @@ private fun LazyListScope.enabledToggle(
     }
 }
 
-private fun LazyListScope.description(enabled: Boolean) {
+private fun LazyListScope.description() {
     item(key = CommonContentKey.DESCRIPTION, contentType = ContentType.DESCRIPTION) {
         SwitchComposeSubtitleCell(
             text =
-                if (enabled) {
-                    stringResource(id = R.string.split_tunneling_description)
-                } else {
-                    stringResource(id = R.string.split_tunneling_disabled_description)
+                buildString {
+                    appendLine(stringResource(id = R.string.split_tunneling_description))
+                    append(stringResource(id = R.string.split_tunneling_description_warning))
                 }
         )
     }