From f1f14e9fedcc5896b164df29fc0eab6ab1c4e596 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Mon, 5 Feb 2024 16:36:01 +0100
Subject: [PATCH] Rename parameter, since it is also invoked in the
 confirmation dialog, not only for the error dialog.

---
 .../io/element/android/features/logout/impl/LogoutView.kt  | 2 +-
 .../features/logout/impl/direct/DefaultDirectLogoutView.kt | 2 +-
 .../android/features/logout/impl/ui/LogoutActionDialog.kt  | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
index ecec90cf06..98827b4700 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt
@@ -86,7 +86,7 @@ fun LogoutView(
         onForceLogoutClicked = {
             eventSink(LogoutEvents.Logout(ignoreSdkError = true))
         },
-        onDismissError = {
+        onDismissDialog = {
             eventSink(LogoutEvents.CloseDialogs)
         },
         onSuccessLogout = {
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
index f646d86c9e..64935f8cda 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/direct/DefaultDirectLogoutView.kt
@@ -41,7 +41,7 @@ class DefaultDirectLogoutView @Inject constructor() : DirectLogoutView {
             onForceLogoutClicked = {
                 eventSink(DirectLogoutEvents.Logout(ignoreSdkError = true))
             },
-            onDismissError = {
+            onDismissDialog = {
                 eventSink(DirectLogoutEvents.CloseDialogs)
             },
             onSuccessLogout = {
diff --git a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
index bf103745b4..18e2809034 100644
--- a/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
+++ b/features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/ui/LogoutActionDialog.kt
@@ -32,8 +32,7 @@ fun LogoutActionDialog(
     state: AsyncAction<String?>,
     onConfirmClicked: () -> Unit,
     onForceLogoutClicked: () -> Unit,
-    // TODO Rename
-    onDismissError: () -> Unit,
+    onDismissDialog: () -> Unit,
     onSuccessLogout: (String?) -> Unit,
 ) {
     when (state) {
@@ -42,7 +41,7 @@ fun LogoutActionDialog(
         AsyncAction.Confirming ->
             LogoutConfirmationDialog(
                 onSubmitClicked = onConfirmClicked,
-                onDismiss = onDismissError
+                onDismiss = onDismissDialog
             )
         is AsyncAction.Loading ->
             ProgressDialog(text = stringResource(id = R.string.screen_signout_in_progress_dialog_content))
@@ -52,7 +51,7 @@ fun LogoutActionDialog(
                 content = stringResource(id = CommonStrings.error_unknown),
                 retryText = stringResource(id = CommonStrings.action_signout_anyway),
                 onRetry = onForceLogoutClicked,
-                onDismiss = onDismissError,
+                onDismiss = onDismissDialog,
             )
         is AsyncAction.Success -> {
             val latestOnSuccessLogout by rememberUpdatedState(onSuccessLogout)