Fixes based on feedback

mullvad · Nov 27, 2024 · 477c4ea · 477c4ea
1 parent 00a8e02
commit 477c4ea
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DaitaScreen.kt
@@ -71,7 +71,7 @@ fun Daita(
     DaitaScreen(
         state = state,
         onDaitaEnabled = viewModel::setDaita,
-        onDirectOnly = { enable ->
+        onDirectOnlyClick = { enable ->
             if (enable) {
                 navigator.navigate(DaitaDirectOnlyConfirmationDestination)
             } else {
@@ -88,7 +88,7 @@ fun Daita(
 fun DaitaScreen(
     state: DaitaUiState,
     onDaitaEnabled: (enable: Boolean) -> Unit = {},
-    onDirectOnly: (enable: Boolean) -> Unit = {},
+    onDirectOnlyClick: (enable: Boolean) -> Unit = {},
     onDirectOnlyInfoClick: () -> Unit = {},
     onBackClick: () -> Unit = {},
 ) {
@@ -110,7 +110,7 @@ fun DaitaScreen(
                 title = stringResource(R.string.direct_only),
                 isToggled = state.directOnly,
                 isEnabled = state.daitaEnabled,
-                onCellClicked = onDirectOnly,
+                onCellClicked = onDirectOnlyClick,
                 onInfoClicked = onDirectOnlyInfoClick,
             )
         }

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/FilterChipUseCase.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/FilterChipUseCase.kt
@@ -39,7 +39,7 @@ class FilterChipUseCase(
                 selectedOwnership = selectedOwnership,
                 selectedConstraintProviders = selectedConstraintProviders,
                 allProviders = allProviders,
-                isDaitaEnabled = settings?.daitaAndDirectOnly() == true,
+                daitaDirectOnly = settings?.daitaAndDirectOnly() == true,
                 isMultihopEnabled = wireguardConstraints?.isMultihopEnabled == true,
                 relayListType = relayListType,
             )
@@ -49,7 +49,7 @@ class FilterChipUseCase(
         selectedOwnership: Constraint<Ownership>,
         selectedConstraintProviders: Constraint<Providers>,
         allProviders: List<Provider>,
-        isDaitaEnabled: Boolean,
+        daitaDirectOnly: Boolean,
         isMultihopEnabled: Boolean,
         relayListType: RelayListType,
     ): List<FilterChip> {
@@ -73,7 +73,7 @@ class FilterChipUseCase(
             }
             if (
                 shouldFilterByDaita(
-                    isDaitaEnabled = isDaitaEnabled,
+                    daitaDirectOnly = daitaDirectOnly,
                     relayListType = relayListType,
                     isMultihopEnabled = isMultihopEnabled,
                 )

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/FilteredRelayListUseCase.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/FilteredRelayListUseCase.kt
@@ -33,7 +33,7 @@ class FilteredRelayListUseCase(
                 providers = selectedProviders,
                 shouldFilterByDaita =
                     shouldFilterByDaita(
-                        isDaitaEnabled = settings?.daitaAndDirectOnly() == true,
+                        daitaDirectOnly = settings?.daitaAndDirectOnly() == true,
                         isMultihopEnabled = wireguardConstraints?.isMultihopEnabled == true,
                         relayListType = relayListType,
                     ),

diff --git a/...in/kotlin/net/mullvad/mullvadvpn/usecase/customlists/FilterCustomListsRelayItemUseCase.kt b/...in/kotlin/net/mullvad/mullvadvpn/usecase/customlists/FilterCustomListsRelayItemUseCase.kt
@@ -34,7 +34,7 @@ class FilterCustomListsRelayItemUseCase(
                 providers = selectedProviders,
                 daita =
                     shouldFilterByDaita(
-                        isDaitaEnabled = settings?.daitaAndDirectOnly() == true,
+                        daitaDirectOnly = settings?.daitaAndDirectOnly() == true,
                         isMultihopEnabled = wireguardConstraints?.isMultihopEnabled == true,
                         relayListType = relayListType,
                     ),

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/Daita.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/Daita.kt
@@ -3,10 +3,10 @@ package net.mullvad.mullvadvpn.util
 import net.mullvad.mullvadvpn.compose.state.RelayListType
 
 fun shouldFilterByDaita(
-    isDaitaEnabled: Boolean,
+    daitaDirectOnly: Boolean,
     isMultihopEnabled: Boolean,
     relayListType: RelayListType,
 ) =
-    isDaitaEnabled &&
+    daitaDirectOnly &&
         (relayListType == RelayListType.ENTRY ||
             !isMultihopEnabled && relayListType == RelayListType.EXIT)