Remove split tunneling menu from VPN settings screen

4 files changed, 1 insertions, 32 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80d599283a..a187ee82f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ Line wrap the file at 100 chars.                                              Th
   is turned off.
 - Add creation date below device name in the device list screen.
 - Changed `AdvancedSettings` page's name and title into `VPN Settings`.
+- Changed `SplitTunneling` menu location from `VPN Settings` to `Settings`.
 
 ### Changed
 - In the CLI, update the `tunnel` subcommand to resemble `relay` more. For example, by adding a
diff --git a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
index 6714d5490d..407bd15569 100644
--- a/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
+++ b/android/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreenTest.kt
@@ -49,7 +49,6 @@ class VpnSettingsScreenTest {
         composeTestRule.apply {
             onNodeWithText("WireGuard MTU").assertExists()
             onNodeWithText("Default").assertExists()
-            onNodeWithText("Split tunneling").assertExists()
             onNodeWithText("Use custom DNS server").assertExists()
             onNodeWithText("Add a server").assertDoesNotExist()
         }
@@ -218,26 +217,6 @@ class VpnSettingsScreenTest {
 
     @Test
     @OptIn(ExperimentalMaterialApi::class)
-    fun testClickSplitTunneling() {
-        // Arrange
-        val mockedClickHandler: () -> Unit = mockk(relaxed = true)
-        composeTestRule.setContent {
-            VpnSettingsScreen(
-                uiState = VpnSettingsUiState.DefaultUiState(),
-                onSplitTunnelingNavigationClick = mockedClickHandler,
-                toastMessagesSharedFlow = MutableSharedFlow<String>().asSharedFlow()
-            )
-        }
-
-        // Act
-        composeTestRule.onNodeWithText("Split tunneling").performClick()
-
-        // Assert
-        verify { mockedClickHandler.invoke() }
-    }
-
-    @Test
-    @OptIn(ExperimentalMaterialApi::class)
     fun testCustomDnsAddressesAndAddButtonVisibleWhenCustomDnsEnabled() {
         // Arrange
         composeTestRule.setContent {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
index 507fbeb37d..e5a1032afd 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/VpnSettingsScreen.kt
@@ -50,7 +50,6 @@ import net.mullvad.mullvadvpn.compose.cell.DnsCell
 import net.mullvad.mullvadvpn.compose.cell.ExpandableComposeCell
 import net.mullvad.mullvadvpn.compose.cell.InformationComposeCell
 import net.mullvad.mullvadvpn.compose.cell.MtuComposeCell
-import net.mullvad.mullvadvpn.compose.cell.NavigationComposeCell
 import net.mullvad.mullvadvpn.compose.cell.SwitchCellTitle
 import net.mullvad.mullvadvpn.compose.cell.SwitchComposeCell
 import net.mullvad.mullvadvpn.compose.component.CollapsableAwareToolbarScaffold
@@ -90,7 +89,6 @@ private fun PreviewVpnSettings() {
         onSaveMtuClick = {},
         onRestoreMtuClick = {},
         onCancelMtuDialogClicked = {},
-        onSplitTunnelingNavigationClick = {},
         onToggleAutoConnect = {},
         onToggleLocalNetworkSharing = {},
         onToggleDnsClick = {},
@@ -128,7 +126,6 @@ fun VpnSettingsScreen(
     onSaveMtuClick: () -> Unit = {},
     onRestoreMtuClick: () -> Unit = {},
     onCancelMtuDialogClicked: () -> Unit = {},
-    onSplitTunnelingNavigationClick: () -> Unit = {},
     onToggleAutoConnect: (Boolean) -> Unit = {},
     onToggleLocalNetworkSharing: (Boolean) -> Unit = {},
     onToggleDnsClick: (Boolean) -> Unit = {},
@@ -275,13 +272,6 @@ fun VpnSettingsScreen(
             }
 
             itemWithDivider {
-                NavigationComposeCell(
-                    title = stringResource(id = R.string.split_tunneling),
-                    onClick = { onSplitTunnelingNavigationClick.invoke() }
-                )
-            }
-
-            itemWithDivider {
                 ExpandableComposeCell(
                     title = stringResource(R.string.dns_content_blockers_title),
                     isExpanded = !expandContentBlockersState,
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt
index f934612e98..79347ad3a9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragment/VpnSettingsFragment.kt
@@ -33,7 +33,6 @@ class VpnSettingsFragment : BaseFragment() {
                         onSaveMtuClick = vm::onSaveMtuClick,
                         onRestoreMtuClick = vm::onRestoreMtuClick,
                         onCancelMtuDialogClicked = vm::onCancelDialogClick,
-                        onSplitTunnelingNavigationClick = ::openSplitTunnelingFragment,
                         onToggleAutoConnect = vm::onToggleAutoConnect,
                         onToggleLocalNetworkSharing = vm::onToggleLocalNetworkSharing,
                         onToggleDnsClick = vm::onToggleDnsClick,