Merge branch 'implement-support-for-daita-with-multihop-droid-1412'

mullvad · Dec 2, 2024 · 2e022ba · 2e022ba
2 parents 64a5704 + 124bf64
commit 2e022ba
Show file tree

Hide file tree

Showing 67 changed files with 1,521 additions and 213 deletions.
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md
@@ -27,6 +27,9 @@ Line wrap the file at 100 chars.                                              Th
   proxies. The access method is enabled by default.
 - Add multihop which allows the routing of traffic through an entry and exit server, making it
   harder to trace.
+- Enable DAITA to route traffic through servers with DAITA support to enable the use
+  of all servers together with DAITA. This behaviour can be disabled with the use of the
+  "Direct only" setting.
 
 ### Changed
 - Animation has been changed to look better with predictive back.

diff --git a/...id/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt b/...id/app/src/androidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreenTest.kt
@@ -34,6 +34,7 @@ class SettingsScreenTest {
                             isSupportedVersion = true,
                             isPlayBuild = false,
                             multihopEnabled = false,
+                            isDaitaEnabled = false,
                         )
                 )
             }
@@ -58,6 +59,7 @@ class SettingsScreenTest {
                             isSupportedVersion = true,
                             isPlayBuild = false,
                             multihopEnabled = false,
+                            isDaitaEnabled = false,
                         )
                 )
             }

diff --git a/...oidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreenTest.kt b/...oidTest/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreenTest.kt
@@ -64,7 +64,7 @@ class SelectLocationScreenTest {
             setContentWithTheme {
                 SelectLocationScreen(
                     state =
-                        SelectLocationUiState(
+                        SelectLocationUiState.Data(
                             // searchTerm = "",
                             filterChips = emptyList(),
                             multihopEnabled = false,
@@ -96,7 +96,7 @@ class SelectLocationScreenTest {
             setContentWithTheme {
                 SelectLocationScreen(
                     state =
-                        SelectLocationUiState(
+                        SelectLocationUiState.Data(
                             filterChips = emptyList(),
                             multihopEnabled = false,
                             relayListType = RelayListType.EXIT,
@@ -124,7 +124,7 @@ class SelectLocationScreenTest {
             setContentWithTheme {
                 SelectLocationScreen(
                     state =
-                        SelectLocationUiState(
+                        SelectLocationUiState.Data(
                             filterChips = emptyList(),
                             multihopEnabled = false,
                             relayListType = RelayListType.EXIT,
@@ -156,7 +156,7 @@ class SelectLocationScreenTest {
             setContentWithTheme {
                 SelectLocationScreen(
                     state =
-                        SelectLocationUiState(
+                        SelectLocationUiState.Data(
                             // searchTerm = "",
                             filterChips = emptyList(),
                             multihopEnabled = false,
@@ -189,7 +189,7 @@ class SelectLocationScreenTest {
             setContentWithTheme {
                 SelectLocationScreen(
                     state =
-                        SelectLocationUiState(
+                        SelectLocationUiState.Data(
                             filterChips = emptyList(),
                             multihopEnabled = false,
                             relayListType = RelayListType.EXIT,

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/constant/ContentType.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/constant/ContentType.kt
@@ -9,4 +9,5 @@ object ContentType {
     const val SPACER = 5
     const val PROGRESS = 6
     const val EMPTY_TEXT = 7
+    const val BUTTON = 8
 }
diff --git a/...compose/dialog/DaitaConfirmationDialog.kt → ...alog/DaitaDirectOnlyConfirmationDialog.kt b/...compose/dialog/DaitaConfirmationDialog.kt → ...alog/DaitaDirectOnlyConfirmationDialog.kt
@@ -1,8 +1,6 @@
 package net.mullvad.mullvadvpn.compose.dialog
 
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -18,34 +16,24 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.compose.dialog.info.InfoConfirmationDialog
 import net.mullvad.mullvadvpn.compose.dialog.info.InfoConfirmationDialogTitleType
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
-import net.mullvad.mullvadvpn.lib.theme.Dimens
 
 @Preview
 @Composable
-private fun PreviewDaitaConfirmationDialog() {
-    AppTheme { DaitaConfirmation(EmptyResultBackNavigator()) }
+private fun PreviewDaitaDirectOnlyConfirmationDialog() {
+    AppTheme { DaitaDirectOnlyConfirmation(EmptyResultBackNavigator()) }
 }
 
 @Destination<RootGraph>(style = DestinationStyle.Dialog::class)
 @Composable
-fun DaitaConfirmation(navigator: ResultBackNavigator<Boolean>) {
+fun DaitaDirectOnlyConfirmation(navigator: ResultBackNavigator<Boolean>) {
     InfoConfirmationDialog(
         navigator = navigator,
         titleType = InfoConfirmationDialogTitleType.IconOnly,
-        confirmButtonTitle = stringResource(R.string.enable_anyway),
-        cancelButtonTitle = stringResource(R.string.back),
+        confirmButtonTitle = stringResource(R.string.enable_direct_only),
+        cancelButtonTitle = stringResource(R.string.cancel),
     ) {
         Text(
-            text = stringResource(id = R.string.daita_relay_subset_warning),
-            color = MaterialTheme.colorScheme.onSurface,
-            style = MaterialTheme.typography.bodySmall,
-            modifier = Modifier.fillMaxWidth(),
-        )
-
-        Spacer(modifier = Modifier.height(Dimens.verticalSpace))
-
-        Text(
-            text = stringResource(id = R.string.daita_warning, stringResource(id = R.string.daita)),
+            text = stringResource(id = R.string.direct_only_description),
             color = MaterialTheme.colorScheme.onSurface,
             style = MaterialTheme.typography.bodySmall,
             modifier = Modifier.fillMaxWidth(),

diff --git a/...pn/compose/dialog/info/DaitaInfoDialog.kt → .../dialog/info/DaitaDirectOnlyInfoDialog.kt b/...pn/compose/dialog/info/DaitaInfoDialog.kt → .../dialog/info/DaitaDirectOnlyInfoDialog.kt
@@ -14,22 +14,15 @@ import net.mullvad.mullvadvpn.lib.theme.AppTheme
 
 @Preview
 @Composable
-private fun PreviewDaitaInfoDialog() {
-    AppTheme { DaitaInfo(EmptyDestinationsNavigator) }
+private fun PreviewDaitaDirectOnlyInfoDialog() {
+    AppTheme { DaitaDirectOnlyInfo(EmptyDestinationsNavigator) }
 }
 
 @Destination<RootGraph>(style = DestinationStyle.Dialog::class)
 @Composable
-fun DaitaInfo(navigator: DestinationsNavigator) {
+fun DaitaDirectOnlyInfo(navigator: DestinationsNavigator) {
     InfoDialog(
-        message =
-            stringResource(
-                id = R.string.daita_info,
-                stringResource(id = R.string.daita),
-                stringResource(id = R.string.daita_full),
-            ),
-        additionalInfo =
-            stringResource(id = R.string.daita_warning, stringResource(id = R.string.daita)),
+        message = stringResource(id = R.string.daita_info),
         onDismiss = dropUnlessResumed { navigator.navigateUp() },
     )
 }
diff --git a/.../net/mullvad/mullvadvpn/compose/preview/SelectLocationsUiStatePreviewParameterProvider.kt b/.../net/mullvad/mullvadvpn/compose/preview/SelectLocationsUiStatePreviewParameterProvider.kt
@@ -12,12 +12,13 @@ class SelectLocationsUiStatePreviewParameterProvider :
     PreviewParameterProvider<SelectLocationUiState> {
     override val values =
         sequenceOf(
-            SelectLocationUiState(
+            SelectLocationUiState.Loading,
+            SelectLocationUiState.Data(
                 filterChips = emptyList(),
                 multihopEnabled = false,
                 relayListType = RelayListType.EXIT,
             ),
-            SelectLocationUiState(
+            SelectLocationUiState.Data(
                 filterChips =
                     listOf(
                         FilterChip.Ownership(ownership = ModelOwnership.Rented),
@@ -26,12 +27,12 @@ class SelectLocationsUiStatePreviewParameterProvider :
                 multihopEnabled = false,
                 relayListType = RelayListType.EXIT,
             ),
-            SelectLocationUiState(
+            SelectLocationUiState.Data(
                 filterChips = emptyList(),
                 multihopEnabled = true,
                 relayListType = RelayListType.ENTRY,
             ),
-            SelectLocationUiState(
+            SelectLocationUiState.Data(
                 filterChips =
                     listOf(
                         FilterChip.Ownership(ownership = ModelOwnership.MullvadOwned),

diff --git a/.../kotlin/net/mullvad/mullvadvpn/compose/preview/SettingsUiStatePreviewParameterProvider.kt b/.../kotlin/net/mullvad/mullvadvpn/compose/preview/SettingsUiStatePreviewParameterProvider.kt
@@ -10,13 +10,15 @@ class SettingsUiStatePreviewParameterProvider : PreviewParameterProvider<Setting
                 appVersion = "2222.22",
                 isLoggedIn = true,
                 isSupportedVersion = true,
+                isDaitaEnabled = true,
                 isPlayBuild = true,
                 multihopEnabled = false,
             ),
             SettingsUiState(
                 appVersion = "9000.1",
                 isLoggedIn = false,
                 isSupportedVersion = false,
+                isDaitaEnabled = false,
                 isPlayBuild = false,
                 multihopEnabled = false,
             ),

diff --git a/...tlin/net/mullvad/mullvadvpn/compose/preview/VpnSettingsUiStatePreviewParameterProvider.kt b/...tlin/net/mullvad/mullvadvpn/compose/preview/VpnSettingsUiStatePreviewParameterProvider.kt
@@ -20,7 +20,6 @@ class VpnSettingsUiStatePreviewParameterProvider : PreviewParameterProvider<VpnS
             VpnSettingsUiState.createDefault(
                 mtu = Mtu(MTU),
                 isLocalNetworkSharingEnabled = true,
-                isDaitaEnabled = true,
                 isCustomDnsEnabled = true,
                 customDnsItems = listOf(CustomDnsItem("0.0.0.0", false)),
                 contentBlockersOptions =