Merge pull request #3667 from element-hq/feature/bma/asyncActionConfirmingWithParam

AsyncAction confirming with param

libraries/architecture/src/main/kotlin/io/element/android/libraries/architecture/AsyncAction.kt

@@ -26,7 +26,9 @@ sealed interface AsyncAction<out T> {
     /**
      * Represents an operation that is currently waiting for user confirmation.
      */
-    data object Confirming : AsyncAction<Nothing>
+    interface Confirming : AsyncAction<Nothing>
+
+    data object ConfirmingNoParams : Confirming
 
     /**
      * Represents an operation that is currently ongoing.
@@ -70,7 +72,7 @@ sealed interface AsyncAction<out T> {
 
     fun isUninitialized(): Boolean = this == Uninitialized
 
-    fun isConfirming(): Boolean = this == Confirming
+    fun isConfirming(): Boolean = this is Confirming
 
     fun isLoading(): Boolean = this == Loading
 

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionProvider.kt

@@ -14,7 +14,7 @@ open class AsyncActionProvider : PreviewParameterProvider<AsyncAction<Unit>> {
     override val values: Sequence<AsyncAction<Unit>>
         get() = sequenceOf(
             AsyncAction.Uninitialized,
-            AsyncAction.Confirming,
+            AsyncAction.ConfirmingNoParams,
             AsyncAction.Loading,
             AsyncAction.Failure(Exception("An error occurred")),
             AsyncAction.Success(Unit),

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/async/AsyncActionView.kt

@@ -34,7 +34,7 @@ fun <T> AsyncActionView(
     async: AsyncAction<T>,
     onSuccess: (T) -> Unit,
     onErrorDismiss: () -> Unit,
-    confirmationDialog: @Composable () -> Unit = { },
+    confirmationDialog: @Composable (AsyncAction.Confirming) -> Unit = { },
     progressDialog: @Composable () -> Unit = { AsyncActionViewDefaults.ProgressDialog() },
     errorTitle: @Composable (Throwable) -> String = { ErrorDialogDefaults.title },
     errorMessage: @Composable (Throwable) -> String = { it.message ?: it.toString() },
@@ -42,7 +42,7 @@ fun <T> AsyncActionView(
 ) {
     when (async) {
         AsyncAction.Uninitialized -> Unit
-        AsyncAction.Confirming -> confirmationDialog()
+        is AsyncAction.Confirming -> confirmationDialog(async)
         is AsyncAction.Loading -> progressDialog()
         is AsyncAction.Failure -> {
             if (onRetry == null) {

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/FakeInvitedRoom.kt

@@ -13,14 +13,15 @@ import io.element.android.libraries.matrix.api.room.InvitedRoom
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.simulateLongTask
 
 class FakeInvitedRoom(
     override val sessionId: SessionId = A_SESSION_ID,
     override val roomId: RoomId = A_ROOM_ID,
     private val declineInviteResult: () -> Result<Unit> = { lambdaError() }
 ) : InvitedRoom {
-    override suspend fun declineInvite(): Result<Unit> {
-        return declineInviteResult()
+    override suspend fun declineInvite(): Result<Unit> = simulateLongTask {
+        declineInviteResult()
     }
 
     override fun close() = Unit

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsView.kt

@@ -122,7 +122,7 @@ private fun ColumnScope.TroubleshootTestView(
 private fun ColumnScope.TroubleshootNotificationsContent(state: TroubleshootNotificationsState) {
     when (state.testSuiteState.mainState) {
         AsyncAction.Loading,
-        AsyncAction.Confirming,
+        is AsyncAction.Confirming,
         is AsyncAction.Success,
         is AsyncAction.Failure -> {
             TestSuiteView(
@@ -150,7 +150,7 @@ private fun ColumnScope.TroubleshootNotificationsContent(state: TroubleshootNoti
             })
             RunTestButton(state = state)
         }
-        AsyncAction.Confirming -> {
+        is AsyncAction.Confirming -> {
             ListItem(headlineContent = {
                 Text(
                     text = stringResource(id = R.string.troubleshoot_notifications_screen_waiting)

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootTestSuite.kt

@@ -102,7 +102,7 @@ fun List<NotificationTroubleshootTestState>.computeMainState(): AsyncAction<Unit
         isRunning -> AsyncAction.Loading
         else -> {
             if (any { it.status is NotificationTroubleshootTestState.Status.WaitingForUser }) {
-                AsyncAction.Confirming
+                AsyncAction.ConfirmingNoParams
             } else if (any { it.status is NotificationTroubleshootTestState.Status.Failure }) {
                 AsyncAction.Failure(Exception("Some tests failed"))
             } else {