Skip to content

Commit 9825962

Browse files
committed
Remove error case from custom list location screen
1 parent 884694a commit 9825962

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

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

-12
Original file line numberDiff line numberDiff line change
@@ -95,26 +95,16 @@ fun CustomListLocations(
9595
}
9696
}
9797

98-
val snackbarHostState = remember { SnackbarHostState() }
99-
val context: Context = LocalContext.current
10098
LaunchedEffectCollect(customListsViewModel.uiSideEffect) { sideEffect ->
10199
when (sideEffect) {
102100
is CustomListLocationsSideEffect.ReturnWithResultData ->
103101
backNavigator.navigateBack(result = sideEffect.result)
104-
CustomListLocationsSideEffect.Error ->
105-
launch {
106-
snackbarHostState.showSnackbarImmediately(
107-
message = context.getString(R.string.error_occurred),
108-
duration = SnackbarDuration.Short
109-
)
110-
}
111102
}
112103
}
113104

114105
val state by customListsViewModel.uiState.collectAsStateWithLifecycle()
115106
CustomListLocationsScreen(
116107
state = state,
117-
snackbarHostState = snackbarHostState,
118108
onSearchTermInput = customListsViewModel::onSearchTermInput,
119109
onSaveClick = customListsViewModel::save,
120110
onRelaySelectionClick = customListsViewModel::onRelaySelectionClick,
@@ -133,15 +123,13 @@ fun CustomListLocations(
133123
@Composable
134124
fun CustomListLocationsScreen(
135125
state: CustomListLocationsUiState,
136-
snackbarHostState: SnackbarHostState = SnackbarHostState(),
137126
onSearchTermInput: (String) -> Unit = {},
138127
onSaveClick: () -> Unit = {},
139128
onRelaySelectionClick: (RelayItem.Location, selected: Boolean) -> Unit = { _, _ -> },
140129
onExpand: (RelayItem.Location, selected: Boolean) -> Unit = { _, _ -> },
141130
onBackClick: () -> Unit = {}
142131
) {
143132
ScaffoldWithSmallTopBar(
144-
snackbarHostState = snackbarHostState,
145133
appBarTitle =
146134
stringResource(
147135
if (state.newList) {

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

+8-4
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,13 @@ class CustomListLocationsViewModel(
116116
)
117117
)
118118
.fold(
119-
{ _uiSideEffect.tryEmit(CustomListLocationsSideEffect.Error) },
119+
{
120+
_uiSideEffect.tryEmit(
121+
CustomListLocationsSideEffect.ReturnWithResultData(
122+
CustomListActionResultData.GenericError
123+
)
124+
)
125+
},
120126
{ result ->
121127
val resultData =
122128
if (navArgs.newList) {
@@ -315,8 +321,6 @@ class CustomListLocationsViewModel(
315321
}
316322

317323
sealed interface CustomListLocationsSideEffect {
318-
data class ReturnWithResultData(val result: CustomListActionResultData.Success) :
324+
data class ReturnWithResultData(val result: CustomListActionResultData) :
319325
CustomListLocationsSideEffect
320-
321-
data object Error : CustomListLocationsSideEffect
322326
}

0 commit comments

Comments
 (0)