Fix lint

mullvad · May 22, 2024 · d7f64c7 · d7f64c7
1 parent 7ba7ef5
commit d7f64c7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/dialog/MtuDialog.kt
@@ -8,11 +8,11 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.result.EmptyResultBackNavigator
 import com.ramcosta.composedestinations.result.ResultBackNavigator
@@ -45,7 +45,7 @@ private fun PreviewMtuDialog() {
 fun MtuDialog(mtuInitial: Mtu?, navigator: ResultBackNavigator<Boolean>) {
     val viewModel = koinViewModel<MtuDialogViewModel>(parameters = { parametersOf(mtuInitial) })
 
-    val uiState by viewModel.uiState.collectAsState()
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     LaunchedEffectCollect(viewModel.uiSideEffect) {
         when (it) {
             MtuDialogSideEffect.Complete -> navigator.navigateBack(result = true)

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt
@@ -103,7 +103,8 @@ private fun PreviewDeviceListLoading() {
 private fun PreviewDeviceListError() {
     AppTheme {
         DeviceListScreen(
-            state = DeviceListUiState.Error(GetDeviceListError.Unknown(IllegalStateException()))
+            state =
+                DeviceListUiState.Error(GetDeviceListError.Unknown(IllegalStateException("Error")))
         )
     }
 }

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
@@ -180,7 +180,7 @@ val uiModule = module {
     }
     viewModel { LoginViewModel(get(), get(), get()) }
     viewModel { PrivacyDisclaimerViewModel(get(), IS_PLAY_BUILD) }
-    viewModel { SelectLocationViewModel(get(), get(), get(), get(), get(), get(), get()) }
+    viewModel { SelectLocationViewModel(get(), get(), get(), get(), get(), get()) }
     viewModel { SettingsViewModel(get(), get(), IS_PLAY_BUILD) }
     viewModel { SplashViewModel(get(), get()) }
     viewModel { VoucherDialogViewModel(get()) }

diff --git a/...id/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/SelectedLocationRelayItemUseCase.kt b/...id/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/SelectedLocationRelayItemUseCase.kt
@@ -41,11 +41,15 @@ class SelectedLocationRelayItemUseCase(
                     relayCountries
                         .withDescendants()
                         .filterIsInstance<RelayItem.Location.City>()
-                        .firstOrNull { it.id == relayItemId.city } ?: return null
+                        .firstOrNull { it.id == relayItemId.city }
 
-                val relay = city.relays.firstOrNull { it.id == relayItemId } ?: return null
+                val relay = city?.relays?.firstOrNull { it.id == relayItemId }
 
-                "${city.name} (${relay.name})"
+                if (city != null && relay != null) {
+                    "${city.name} (${relay.name})"
+                } else {
+                    null
+                }
             }
             is GeoLocationId.City -> relayCountries.findItemForGeoLocationId(relayItemId)?.name
             is GeoLocationId.Country -> relayCountries.findItemForGeoLocationId(relayItemId)?.name

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt
@@ -25,7 +25,6 @@ import net.mullvad.mullvadvpn.repository.RelayListFilterRepository
 import net.mullvad.mullvadvpn.repository.RelayListRepository
 import net.mullvad.mullvadvpn.usecase.AvailableProvidersUseCase
 import net.mullvad.mullvadvpn.usecase.FilteredRelayListUseCase
-import net.mullvad.mullvadvpn.usecase.SelectedLocationRelayItemUseCase
 import net.mullvad.mullvadvpn.usecase.customlists.CustomListActionUseCase
 import net.mullvad.mullvadvpn.usecase.customlists.CustomListsRelayItemUseCase
 import net.mullvad.mullvadvpn.util.combine
@@ -34,7 +33,6 @@ class SelectLocationViewModel(
     private val relayListFilterRepository: RelayListFilterRepository,
     availableProvidersUseCase: AvailableProvidersUseCase,
     customListsRelayItemUseCase: CustomListsRelayItemUseCase,
-    selectedLocationRelayItemUseCase: SelectedLocationRelayItemUseCase,
     private val customListActionUseCase: CustomListActionUseCase,
     filteredRelayListUseCase: FilteredRelayListUseCase,
     private val relayListRepository: RelayListRepository

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt
@@ -34,7 +34,6 @@ import net.mullvad.mullvadvpn.repository.RelayListFilterRepository
 import net.mullvad.mullvadvpn.repository.RelayListRepository
 import net.mullvad.mullvadvpn.usecase.AvailableProvidersUseCase
 import net.mullvad.mullvadvpn.usecase.FilteredRelayListUseCase
-import net.mullvad.mullvadvpn.usecase.SelectedLocationRelayItemUseCase
 import net.mullvad.mullvadvpn.usecase.customlists.CustomListActionUseCase
 import net.mullvad.mullvadvpn.usecase.customlists.CustomListsRelayItemUseCase
 import org.junit.jupiter.api.AfterEach
@@ -49,7 +48,6 @@ class SelectLocationViewModelTest {
     private val mockAvailableProvidersUseCase: AvailableProvidersUseCase = mockk(relaxed = true)
     private val mockCustomListActionUseCase: CustomListActionUseCase = mockk(relaxed = true)
     private val mockCustomListsRelayItemUseCase: CustomListsRelayItemUseCase = mockk()
-    private val mockSelectedLocationRelayItemUseCase: SelectedLocationRelayItemUseCase = mockk()
     private val mockFilteredRelayListUseCase: FilteredRelayListUseCase = mockk()
     private val mockRelayListRepository: RelayListRepository = mockk()
 
@@ -81,7 +79,6 @@ class SelectLocationViewModelTest {
                 relayListFilterRepository = mockRelayListFilterRepository,
                 availableProvidersUseCase = mockAvailableProvidersUseCase,
                 customListsRelayItemUseCase = mockCustomListsRelayItemUseCase,
-                selectedLocationRelayItemUseCase = mockSelectedLocationRelayItemUseCase,
                 customListActionUseCase = mockCustomListActionUseCase,
                 filteredRelayListUseCase = mockFilteredRelayListUseCase,
                 relayListRepository = mockRelayListRepository