Merge branch 'add-system-apps-to-splittunnel'

2 files changed, 17 insertions, 5 deletions

diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt b/android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt
index 578f6b4821..e1a9e37ac4 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt
+++ b/android/src/test/kotlin/net/mullvad/mullvadvpn/applist/ApplicationsProviderTest.kt
@@ -51,6 +51,7 @@ class ApplicationsProviderTest {
         val result = testSubject.getAppsList()
         val expected = listOf(
             AppData(launchWithInternetPackageName, 0, launchWithInternetPackageName),
+            AppData(nonLaunchWithInternetPackageName, 0, nonLaunchWithInternetPackageName, true),
             AppData(leanbackLaunchWithInternetPackageName, 0, leanbackLaunchWithInternetPackageName)
         )
 
@@ -74,8 +75,7 @@ class ApplicationsProviderTest {
             listOf(
                 launchWithInternetPackageName,
                 nonLaunchWithInternetPackageName,
-                leanbackLaunchWithInternetPackageName,
-                selfPackageName
+                leanbackLaunchWithInternetPackageName
             ).forEach { packageName ->
                 mockedPackageManager.getLaunchIntentForPackage(packageName)
             }
@@ -93,7 +93,8 @@ class ApplicationsProviderTest {
         packageName: String,
         launch: Boolean = false,
         leanback: Boolean = false,
-        internet: Boolean = false
+        internet: Boolean = false,
+        systemApp: Boolean = false
     ): ApplicationInfo {
         val mockApplicationInfo = mockk<ApplicationInfo>()
 
@@ -104,14 +105,14 @@ class ApplicationsProviderTest {
 
         every {
             mockedPackageManager.getLaunchIntentForPackage(packageName)
-        } returns if (launch)
+        } returns if (launch || systemApp)
             mockk()
         else
             null
 
         every {
             mockedPackageManager.getLeanbackLaunchIntentForPackage(packageName)
-        } returns if (leanback)
+        } returns if (leanback || systemApp)
             mockk()
         else
             null
diff --git a/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt b/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
index f2834082c5..ac229ba3fb 100644
--- a/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
+++ b/android/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelTest.kt
@@ -93,6 +93,7 @@ class SplitTunnelingViewModelTest {
             createMainItem(R.string.exclude_applications),
             createApplicationItem(appExcluded, true),
             createDivider(1),
+            createSwitchItem(R.string.show_system_apps, false),
             createMainItem(R.string.all_applications),
             createApplicationItem(appNotExcluded, false),
         )
@@ -131,6 +132,7 @@ class SplitTunnelingViewModelTest {
         val expectedList = listOf(
             createTextItem(R.string.split_tunneling_description),
             createDivider(1),
+            createSwitchItem(R.string.show_system_apps, false),
             createMainItem(R.string.all_applications),
             createApplicationItem(app, false),
         )
@@ -156,6 +158,7 @@ class SplitTunnelingViewModelTest {
         val expectedListBeforeAction = listOf(
             createTextItem(R.string.split_tunneling_description),
             createDivider(1),
+            createSwitchItem(R.string.show_system_apps, false),
             createMainItem(R.string.all_applications),
             createApplicationItem(app, false),
         )
@@ -224,4 +227,12 @@ class SplitTunnelingViewModelTest {
     private fun createProgressItem(): ListItemData = ListItemData.build(identifier = "progress") {
         type = ListItemData.PROGRESS
     }
+
+    private fun createSwitchItem(@StringRes text: Int, checked: Boolean): ListItemData =
+        ListItemData.build(identifier = "switch_$text") {
+            type = ListItemData.ACTION
+            textRes = text
+            action = ListItemData.ItemAction(text.toString())
+            widget = WidgetState.SwitchState(checked)
+        }
 }