From fafd5d4871c36fc81512d5f9362c3d54892e6079 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 4 Oct 2024 12:24:50 +0200 Subject: [PATCH] Let `invokeOnCurrentTimeline` lambda param return Unit so that we can remove `run` block. --- .../impl/messagecomposer/MessageComposerPresenter.kt | 12 +++++------- .../messages/impl/timeline/TimelineController.kt | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt index 6b80605401..8529732b06 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt @@ -592,13 +592,11 @@ class MessageComposerPresenter @Inject constructor( ) timelineController.invokeOnCurrentTimeline { val replyToDetails = loadReplyDetails(draftType.eventId).map(permalinkParser) - run { - messageComposerContext.composerMode = MessageComposerMode.Reply( - replyToDetails = replyToDetails, - // I guess it's fine to always render the image when restoring a draft - hideImage = false - ) - } + messageComposerContext.composerMode = MessageComposerMode.Reply( + replyToDetails = replyToDetails, + // I guess it's fine to always render the image when restoring a draft + hideImage = false + ) } } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt index d83e526694..c55750dac5 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineController.kt @@ -57,7 +57,7 @@ class TimelineController @Inject constructor( return detachedTimeline.map { !it.isPresent } } - suspend fun invokeOnCurrentTimeline(block: suspend (Timeline.() -> Any)) { + suspend fun invokeOnCurrentTimeline(block: suspend (Timeline.() -> Unit)) { currentTimelineFlow.value.run { block(this) }