From 56668377d415743ffff6eca04326d695214cc9b5 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 27 Jan 2026 09:57:36 +0100 Subject: [PATCH] AttachmentsPreviewEvents -> AttachmentsPreviewEvent --- ...ewEvents.kt => AttachmentsPreviewEvent.kt} | 8 +++--- .../preview/AttachmentsPreviewPresenter.kt | 8 +++--- .../preview/AttachmentsPreviewState.kt | 2 +- .../preview/AttachmentsPreviewView.kt | 8 +++--- .../AttachmentsPreviewPresenterTest.kt | 28 +++++++++---------- 5 files changed, 27 insertions(+), 27 deletions(-) rename features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/{AttachmentsPreviewEvents.kt => AttachmentsPreviewEvent.kt} (69%) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvent.kt similarity index 69% rename from features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvents.kt rename to features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvent.kt index d8e29de92e..d473d4c3f4 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvents.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewEvent.kt @@ -8,8 +8,8 @@ package io.element.android.features.messages.impl.attachments.preview -sealed interface AttachmentsPreviewEvents { - data object SendAttachment : AttachmentsPreviewEvents - data object CancelAndDismiss : AttachmentsPreviewEvents - data object CancelAndClearSendState : AttachmentsPreviewEvents +sealed interface AttachmentsPreviewEvent { + data object SendAttachment : AttachmentsPreviewEvent + data object CancelAndDismiss : AttachmentsPreviewEvent + data object CancelAndClearSendState : AttachmentsPreviewEvent } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt index 6db903cb1b..8e92e53f6a 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewPresenter.kt @@ -140,9 +140,9 @@ class AttachmentsPreviewPresenter( } } - fun handleEvent(event: AttachmentsPreviewEvents) { + fun handleEvent(event: AttachmentsPreviewEvent) { when (event) { - is AttachmentsPreviewEvents.SendAttachment -> { + is AttachmentsPreviewEvent.SendAttachment -> { ongoingSendAttachmentJob.value = coroutineScope.launch { // If the media optimization selector is displayed, we need to wait for the user to select the options // before we can pre-process the media. @@ -191,7 +191,7 @@ class AttachmentsPreviewPresenter( } } } - AttachmentsPreviewEvents.CancelAndDismiss -> { + AttachmentsPreviewEvent.CancelAndDismiss -> { displayFileTooLargeError = false // Cancel media preprocessing and sending @@ -206,7 +206,7 @@ class AttachmentsPreviewPresenter( sendActionState, ) } - AttachmentsPreviewEvents.CancelAndClearSendState -> { + AttachmentsPreviewEvent.CancelAndClearSendState -> { // Cancel media sending ongoingSendAttachmentJob.value?.let { it.cancel() diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt index 42d01a4f21..97ca230d77 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewState.kt @@ -20,7 +20,7 @@ data class AttachmentsPreviewState( val textEditorState: TextEditorState, val mediaOptimizationSelectorState: MediaOptimizationSelectorState, val displayFileTooLargeError: Boolean, - val eventSink: (AttachmentsPreviewEvents) -> Unit + val eventSink: (AttachmentsPreviewEvent) -> Unit, ) @Immutable diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt index 8f55957e32..bb3a07c2ff 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt @@ -82,15 +82,15 @@ fun AttachmentsPreviewView( modifier: Modifier = Modifier, ) { fun postSendAttachment() { - state.eventSink(AttachmentsPreviewEvents.SendAttachment) + state.eventSink(AttachmentsPreviewEvent.SendAttachment) } fun postCancel() { - state.eventSink(AttachmentsPreviewEvents.CancelAndDismiss) + state.eventSink(AttachmentsPreviewEvent.CancelAndDismiss) } fun postClearSendState() { - state.eventSink(AttachmentsPreviewEvents.CancelAndClearSendState) + state.eventSink(AttachmentsPreviewEvent.CancelAndClearSendState) } BackHandler(enabled = state.sendActionState !is SendActionState.Sending.Uploading && state.sendActionState !is SendActionState.Done) { @@ -199,7 +199,7 @@ private fun AttachmentPreviewContent( AlertDialog( title = stringResource(CommonStrings.dialog_file_too_large_to_upload_title), content = content, - onDismiss = { state.eventSink(AttachmentsPreviewEvents.CancelAndDismiss) }, + onDismiss = { state.eventSink(AttachmentsPreviewEvent.CancelAndDismiss) }, ) } } diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt index fe462fc988..1e4bea0b4a 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/attachments/AttachmentsPreviewPresenterTest.kt @@ -15,7 +15,7 @@ import app.cash.molecule.RecompositionMode import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.features.messages.impl.attachments.preview.AttachmentsPreviewEvents +import io.element.android.features.messages.impl.attachments.preview.AttachmentsPreviewEvent import io.element.android.features.messages.impl.attachments.preview.AttachmentsPreviewPresenter import io.element.android.features.messages.impl.attachments.preview.OnDoneListener import io.element.android.features.messages.impl.attachments.preview.SendActionState @@ -117,7 +117,7 @@ class AttachmentsPreviewPresenterTest { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = true)) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo)) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo)) @@ -156,7 +156,7 @@ class AttachmentsPreviewPresenterTest { processLatch.complete(Unit) advanceUntilIdle() assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo)) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo)) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done) @@ -191,7 +191,7 @@ class AttachmentsPreviewPresenterTest { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) // Pre-processing finishes processLatch.complete(Unit) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = true)) @@ -221,7 +221,7 @@ class AttachmentsPreviewPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) // Pre-processing finishes processLatch.complete(Unit) @@ -249,7 +249,7 @@ class AttachmentsPreviewPresenterTest { // Pre-processing finishes processLatch.complete(Unit) advanceUntilIdle() - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Failure::class.java) } @@ -270,7 +270,7 @@ class AttachmentsPreviewPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) - initialState.eventSink(AttachmentsPreviewEvents.CancelAndDismiss) + initialState.eventSink(AttachmentsPreviewEvent.CancelAndDismiss) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Done) deleteCallback.assertions().isCalledOnce() onDoneListener.assertions().isCalledOnce() @@ -304,7 +304,7 @@ class AttachmentsPreviewPresenterTest { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) initialState.textEditorState.setMarkdown(A_CAPTION) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.ReadyToUpload::class.java) assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.Uploading::class.java) @@ -347,7 +347,7 @@ class AttachmentsPreviewPresenterTest { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) initialState.textEditorState.setMarkdown(A_CAPTION) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.ReadyToUpload::class.java) assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.Uploading::class.java) @@ -388,7 +388,7 @@ class AttachmentsPreviewPresenterTest { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) initialState.textEditorState.setMarkdown(A_CAPTION) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.ReadyToUpload::class.java) assertThat(awaitItem().sendActionState).isInstanceOf(SendActionState.Sending.Uploading::class.java) @@ -423,7 +423,7 @@ class AttachmentsPreviewPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo)) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo)) @@ -434,7 +434,7 @@ class AttachmentsPreviewPresenterTest { val failureState = awaitItem() assertThat(failureState.sendActionState).isEqualTo(SendActionState.Failure(failure, mediaUploadInfo)) sendFileResult.assertions().isCalledOnce() - failureState.eventSink(AttachmentsPreviewEvents.CancelAndClearSendState) + failureState.eventSink(AttachmentsPreviewEvent.CancelAndClearSendState) val clearedState = awaitLastSequentialItem() assertThat(clearedState.sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo)) } @@ -458,11 +458,11 @@ class AttachmentsPreviewPresenterTest { }.test { val initialState = awaitItem() assertThat(initialState.sendActionState).isEqualTo(SendActionState.Idle) - initialState.eventSink(AttachmentsPreviewEvents.SendAttachment) + initialState.eventSink(AttachmentsPreviewEvent.SendAttachment) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Processing(displayProgress = false)) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo)) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.Uploading(mediaUploadInfo)) - initialState.eventSink(AttachmentsPreviewEvents.CancelAndClearSendState) + initialState.eventSink(AttachmentsPreviewEvent.CancelAndClearSendState) assertThat(awaitItem().sendActionState).isEqualTo(SendActionState.Sending.ReadyToUpload(mediaUploadInfo)) // The sending is cancelled and the state is kept at ReadyToUpload ensureAllEventsConsumed()