Fix review issues

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/cell/FilterRow.kt

@@ -46,7 +46,7 @@ fun FilterRow(
             Modifier.padding(horizontal = Dimens.searchFieldHorizontalPadding)
                 .fillMaxWidth()
                 .horizontalScroll(scrollState),
-        horizontalArrangement = Arrangement.spacedBy(Dimens.chipSpace, alignment = Alignment.Start),
+        horizontalArrangement = Arrangement.spacedBy(Dimens.chipSpace),
     ) {
         if (showTitle) {
             Text(

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/SettingsUiStatePreviewParameterProvider.kt

@@ -11,14 +11,14 @@ class SettingsUiStatePreviewParameterProvider : PreviewParameterProvider<Setting
                 isLoggedIn = true,
                 isSupportedVersion = true,
                 isPlayBuild = true,
-                useMultihop = false,
+                multihopEnabled = false,
             ),
             SettingsUiState(
                 appVersion = "9000.1",
                 isLoggedIn = false,
                 isSupportedVersion = false,
                 isPlayBuild = false,
-                useMultihop = false,
+                multihopEnabled = false,
             ),
         )
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/SettingsScreen.kt

@@ -102,7 +102,7 @@ fun SettingsScreen(
             if (state.isLoggedIn) {
                 itemWithDivider {
                     Multihop(
-                        isMultihopEnabled = state.useMultihop,
+                        isMultihopEnabled = state.multihopEnabled,
                         onMultihopClick = onMultihopClick,
                     )
                 }
@@ -191,7 +191,7 @@ private fun FaqAndGuides() {
     NavigationComposeCell(
         title = faqGuideLabel,
         bodyView =
-            @Composable {
+            {
                 DefaultExternalLinkView(
                     chevronContentDescription = faqGuideLabel,
                     tint = MaterialTheme.colorScheme.onPrimary,
@@ -213,7 +213,7 @@ private fun PrivacyPolicy(state: SettingsUiState) {
     NavigationComposeCell(
         title = privacyPolicyLabel,
         bodyView =
-            @Composable {
+            {
                 DefaultExternalLinkView(
                     chevronContentDescription = privacyPolicyLabel,
                     tint = MaterialTheme.colorScheme.onPrimary,
@@ -229,21 +229,20 @@ private fun Multihop(isMultihopEnabled: Boolean, onMultihopClick: () -> Unit) {
     NavigationComposeCell(
         title = title,
         onClick = onMultihopClick,
-        bodyView =
-            @Composable {
-                NavigationCellBody(
-                    content =
-                        stringResource(
-                            if (isMultihopEnabled) {
-                                R.string.on
-                            } else {
-                                R.string.off
-                            }
-                        ),
-                    contentBodyDescription = title,
-                    textColor = MaterialTheme.colorScheme.onSurfaceVariant,
-                    isExternalLink = false,
-                )
-            },
+        bodyView = {
+            NavigationCellBody(
+                content =
+                    stringResource(
+                        if (isMultihopEnabled) {
+                            R.string.on
+                        } else {
+                            R.string.off
+                        }
+                    ),
+                contentBodyDescription = title,
+                textColor = MaterialTheme.colorScheme.onSurfaceVariant,
+                isExternalLink = false,
+            )
+        },
     )
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/RelayListContent.kt

@@ -74,6 +74,7 @@ fun LazyListScope.relayListContent(
                             listItem,
                             relayListSelection,
                             { onSelectRelay(listItem.item) },
+                            // Only direct children can be removed
                             if (listItem.depth == 1) {
                                 {
                                     onUpdateBottomSheetState(
@@ -99,7 +100,6 @@ fun LazyListScope.relayListContent(
                             relayListSelection = relayListSelection,
                             { onSelectRelay(listItem.item) },
                             {
-                                // Only direct children can be removed
                                 onUpdateBottomSheetState(
                                     ShowLocationBottomSheet(customLists, listItem.item)
                                 )

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SearchLocationScreen.kt

@@ -19,7 +19,6 @@ import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SearchBarDefaults
-import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
@@ -119,8 +118,7 @@ fun SearchLocation(
             SearchLocationSideEffect.GenericError ->
                 launch {
                     snackbarHostState.showSnackbarImmediately(
-                        message = context.getString(R.string.error_occurred),
-                        duration = SnackbarDuration.Short,
+                        message = context.getString(R.string.error_occurred)
                     )
                 }
         }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationList.kt

@@ -44,8 +44,7 @@ fun SelectLocationList(
     val lazyListState = rememberLazyListState()
     val stateActual = state
     RunOnKeyChange(stateActual is SelectLocationListUiState.Content) {
-        val index = stateActual.indexOfSelectedRelayItem()
-        if (index != -1) {
+        stateActual.indexOfSelectedRelayItem()?.let { index ->
             lazyListState.scrollToItem(index)
             lazyListState.animateScrollAndCentralizeItem(index)
         }
@@ -85,21 +84,21 @@ private fun LazyListScope.loading() {
     }
 }
 
-private fun SelectLocationListUiState.indexOfSelectedRelayItem(): Int =
+private fun SelectLocationListUiState.indexOfSelectedRelayItem(): Int? =
     if (this is SelectLocationListUiState.Content) {
         relayListItems.indexOfFirst {
             when (it) {
                 is RelayListItem.CustomListItem -> it.isSelected
                 is RelayListItem.GeoLocationItem -> it.isSelected
-                is RelayListItem.CustomListEntryItem -> false
-                is RelayListItem.CustomListFooter -> false
-                RelayListItem.CustomListHeader -> false
-                RelayListItem.LocationHeader -> false
+                is RelayListItem.CustomListEntryItem,
+                is RelayListItem.CustomListFooter,
+                RelayListItem.CustomListHeader,
+                RelayListItem.LocationHeader,
                 is RelayListItem.LocationsEmptyText -> false
             }
         }
     } else {
-        -1
+        null
     }
 
 private suspend fun LazyListState.animateScrollAndCentralizeItem(index: Int) {

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/location/SelectLocationScreen.kt

@@ -18,7 +18,6 @@ import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SingleChoiceSegmentedButtonRow
-import androidx.compose.material3.SnackbarDuration
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -118,8 +117,7 @@ fun SelectLocation(
             SelectLocationSideEffect.GenericError ->
                 launch {
                     snackbarHostState.showSnackbarImmediately(
-                        message = context.getString(R.string.error_occurred),
-                        duration = SnackbarDuration.Short,
+                        message = context.getString(R.string.error_occurred)
                     )
                 }
         }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayListItem.kt

@@ -62,7 +62,7 @@ sealed interface RelayListItem {
     }
 
     data object LocationHeader : RelayListItem {
-        override val key: Any = "location_header"
+        override val key = "location_header"
         override val contentType = RelayListItemContentType.LOCATION_HEADER
     }
 
@@ -78,7 +78,7 @@ sealed interface RelayListItem {
     }
 
     data class LocationsEmptyText(val searchTerm: String) : RelayListItem {
-        override val key: Any = "locations_empty_text"
+        override val key = "locations_empty_text"
         override val contentType = RelayListItemContentType.LOCATIONS_EMPTY_TEXT
     }
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/SettingsUiState.kt

@@ -5,5 +5,5 @@ data class SettingsUiState(
     val isLoggedIn: Boolean,
     val isSupportedVersion: Boolean,
     val isPlayBuild: Boolean,
-    val useMultihop: Boolean,
+    val multihopEnabled: Boolean,
 )

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SettingsViewModel.kt

@@ -30,7 +30,7 @@ class SettingsViewModel(
                     appVersion = versionInfo.currentVersion,
                     isSupportedVersion = versionInfo.isSupported,
                     isPlayBuild = isPlayBuild,
-                    useMultihop = wireguardConstraints?.useMultihop ?: false,
+                    multihopEnabled = wireguardConstraints?.useMultihop ?: false,
                 )
             }
             .stateIn(
@@ -41,7 +41,7 @@ class SettingsViewModel(
                     isLoggedIn = false,
                     isSupportedVersion = true,
                     isPlayBuild = isPlayBuild,
-                    useMultihop = false,
+                    multihopEnabled = false,
                 ),
             )
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/location/RelayItemListCreator.kt

@@ -7,32 +7,32 @@ import net.mullvad.mullvadvpn.lib.model.GeoLocationId
 import net.mullvad.mullvadvpn.lib.model.RelayItem
 import net.mullvad.mullvadvpn.lib.model.RelayItemId
 import net.mullvad.mullvadvpn.lib.model.SelectedLocation
+import net.mullvad.mullvadvpn.relaylist.MIN_SEARCH_LENGTH
 import net.mullvad.mullvadvpn.relaylist.filterOnSearchTerm
 
 // Creates a relay list to be displayed by RelayListContent
-// Search input as null is defined as not searching
 internal fun relayListItems(
-    searchTerm: String? = null,
+    searchTerm: String = "",
     relayCountries: List<RelayItem.Location.Country>,
     customLists: List<RelayItem.CustomList>,
     selectedItem: RelayItemId?,
     disabledItem: RelayItemId?,
     expandedItems: Set<String>,
 ): List<RelayListItem> {
-    val filteredCustomLists = customLists.filterOnSearchTerm(searchTerm ?: "")
+    val filteredCustomLists = customLists.filterOnSearchTerm(searchTerm)
 
     return buildList {
         val relayItems =
             createRelayListItems(
-                isSearching = searchTerm != null,
+                isSearching = searchTerm.isSearching(),
                 selectedItem = selectedItem,
                 disabledItem = disabledItem,
                 customLists = filteredCustomLists,
                 countries = relayCountries,
             ) {
                 it in expandedItems
             }
-        if (relayItems.isEmpty() && searchTerm != null) {
+        if (relayItems.isEmpty()) {
             add(RelayListItem.LocationsEmptyText(searchTerm))
         } else {
             addAll(relayItems)
@@ -266,3 +266,5 @@ private fun RelayItemId?.singleRelayId(customLists: List<RelayItem.CustomList>):
                 ?.id as? GeoLocationId.Hostname
         else -> null
     }
+
+private fun String.isSearching() = length >= MIN_SEARCH_LENGTH

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/location/SearchLocationViewModel.kt

@@ -140,10 +140,12 @@ class SearchLocationViewModel(
             .map { it.second }
 
     private fun filterChips() =
-        filterChipUseCase().map { filterChips: List<FilterChip> ->
+        combine(filterChipUseCase(), wireguardConstraintsRepository.wireguardConstraints) {
+            filterChips,
+            constraints ->
             filterChips.toMutableList().apply {
                 // Do not show entry and exit filter chips if multihop is disabled
-                if (multihopEnabled()) {
+                if (constraints?.useMultihop == true) {
                     add(
                         when (relayListSelection) {
                             RelayListSelection.Entry -> FilterChip.Entry
@@ -154,9 +156,6 @@ class SearchLocationViewModel(
             }
         }
 
-    private fun multihopEnabled() =
-        wireguardConstraintsRepository.wireguardConstraints.value?.useMultihop == true
-
     fun addLocationToList(item: RelayItem.Location, customList: RelayItem.CustomList) {
         viewModelScope.launch {
             val result =

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/location/SelectLocationListViewModel.kt

@@ -2,7 +2,6 @@ package net.mullvad.mullvadvpn.viewmodel.location
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import co.touchlab.kermit.Logger
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -65,18 +64,15 @@ class SelectLocationListViewModel(
     private fun initialExpand(item: RelayItemId?): Set<String> = buildSet {
         when (item) {
             is GeoLocationId.City -> {
-                Logger.d("GC item: $item")
                 add(item.country.code)
             }
             is GeoLocationId.Hostname -> {
-                Logger.d("GH item: $item")
                 add(item.country.code)
                 add(item.city.code)
             }
             is CustomListId,
             is GeoLocationId.Country,
             null -> {
-                Logger.d("NO item: $item")
                 /* No expands */
             }
         }