Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rename parameter, since it is also invoked in the confirmation dialog, not only for the error dialog.

Browse source
This commit is contained in:
Benoit Marty 2024-02-05 16:36:01 +01:00 • committed by Benoit Marty
parent a1f78372d6
commit f1f14e9fed
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
View file

@ -86,7 +86,7 @@ fun LogoutView(
onForceLogoutClicked = { onForceLogoutClicked = {
eventSink(LogoutEvents.Logout(ignoreSdkError = true)) eventSink(LogoutEvents.Logout(ignoreSdkError = true))
}, },
onDismissError = { onDismissDialog = {
eventSink(LogoutEvents.CloseDialogs) eventSink(LogoutEvents.CloseDialogs)
}, },
onSuccessLogout = { onSuccessLogout = {

2
features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
View file

@ -41,7 +41,7 @@ class DefaultDirectLogoutView @Inject constructor() : DirectLogoutView {
onForceLogoutClicked = { onForceLogoutClicked = {
eventSink(DirectLogoutEvents.Logout(ignoreSdkError = true)) eventSink(DirectLogoutEvents.Logout(ignoreSdkError = true))
}, },
onDismissError = { onDismissDialog = {
eventSink(DirectLogoutEvents.CloseDialogs) eventSink(DirectLogoutEvents.CloseDialogs)
}, },
onSuccessLogout = { onSuccessLogout = {

7
features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
View file

@ -32,8 +32,7 @@ fun LogoutActionDialog(
state: AsyncAction<String?>, state: AsyncAction<String?>,
onConfirmClicked: () -> Unit, onConfirmClicked: () -> Unit,
onForceLogoutClicked: () -> Unit, onForceLogoutClicked: () -> Unit,
// TODO Rename onDismissDialog: () -> Unit,
onDismissError: () -> Unit,
onSuccessLogout: (String?) -> Unit, onSuccessLogout: (String?) -> Unit,
) { ) {
when (state) { when (state) {
@ -42,7 +41,7 @@ fun LogoutActionDialog(
AsyncAction.Confirming -> AsyncAction.Confirming ->
LogoutConfirmationDialog( LogoutConfirmationDialog(
onSubmitClicked = onConfirmClicked, onSubmitClicked = onConfirmClicked,
onDismiss = onDismissError onDismiss = onDismissDialog
) )
is AsyncAction.Loading -> is AsyncAction.Loading ->
ProgressDialog(text = stringResource(id = R.string.screen_signout_in_progress_dialog_content)) ProgressDialog(text = stringResource(id = R.string.screen_signout_in_progress_dialog_content))
@ -52,7 +51,7 @@ fun LogoutActionDialog(
content = stringResource(id = CommonStrings.error_unknown), content = stringResource(id = CommonStrings.error_unknown),
retryText = stringResource(id = CommonStrings.action_signout_anyway), retryText = stringResource(id = CommonStrings.action_signout_anyway),
onRetry = onForceLogoutClicked, onRetry = onForceLogoutClicked,
onDismiss = onDismissError, onDismiss = onDismissDialog,
) )
is AsyncAction.Success -> { is AsyncAction.Success -> {
val latestOnSuccessLogout by rememberUpdatedState(onSuccessLogout) val latestOnSuccessLogout by rememberUpdatedState(onSuccessLogout)