From 1f5f6896c6836e8afa5a55e4b39112efd6c0d183 Mon Sep 17 00:00:00 2001 From: Jorge Martin Espinosa Date: Thu, 30 Oct 2025 08:39:06 +0100 Subject: [PATCH] Fix marking a room as read re-instantiates its timeline (#5628) * Add `Timeline.markAsRead` to avoid reinstantiating the timeline using `Room.markAsRead` * Mark as read when exiting the room screen, destroy the timeline when fully closed * Ensure `MarkAsFullyReadAndExit` event can only be processed once * Fix `DelayedVisibility` not being displayed in previews --- .../appnav/room/joined/LoadingRoomNodeView.kt | 5 +- .../appnav/JoinedRoomLoadedFlowNodeTest.kt | 8 +- .../features/messages/impl/MessagesEvents.kt | 1 + .../messages/impl/MessagesNavigator.kt | 1 + .../features/messages/impl/MessagesNode.kt | 10 ++- .../messages/impl/MessagesPresenter.kt | 24 ++++++ .../impl/threads/ThreadedMessagesNode.kt | 2 + .../messages/impl/timeline/MarkAsFullyRead.kt | 19 ++--- .../impl/timeline/TimelinePresenter.kt | 10 +-- .../messages/impl/FakeMessagesNavigator.kt | 5 ++ .../messages/impl/MessagesPresenterTest.kt | 77 +++++++++++++++++-- .../timeline/DefaultMarkAsFullyReadTest.kt | 39 +++++----- .../impl/timeline/FakeMarkAsFullyRead.kt | 8 +- .../impl/timeline/TimelinePresenterTest.kt | 42 ++++------ .../designsystem/utils/DelayedVisibility.kt | 46 +++++++++++ .../libraries/matrix/api/MatrixClient.kt | 10 +++ .../api/auth/qrlogin/QrLoginException.kt | 2 +- .../libraries/matrix/api/room/BaseRoom.kt | 5 ++ .../libraries/matrix/api/timeline/Timeline.kt | 6 ++ .../libraries/matrix/impl/RustMatrixClient.kt | 8 ++ .../matrix/impl/room/JoinedRustRoom.kt | 1 + .../matrix/impl/timeline/RustTimeline.kt | 12 +++ .../libraries/matrix/test/FakeMatrixClient.kt | 6 ++ .../matrix/test/timeline/FakeTimeline.kt | 23 ++++-- 24 files changed, 281 insertions(+), 89 deletions(-) create mode 100644 libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DelayedVisibility.kt diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt index deedf5f867..a9c78fd4c7 100644 --- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt +++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/LoadingRoomNodeView.kt @@ -26,6 +26,7 @@ import io.element.android.libraries.designsystem.theme.components.CircularProgre import io.element.android.libraries.designsystem.theme.components.Scaffold import io.element.android.libraries.designsystem.theme.components.Text import io.element.android.libraries.designsystem.theme.components.TopAppBar +import io.element.android.libraries.designsystem.utils.DelayedVisibility import io.element.android.libraries.matrix.ui.room.LoadingRoomState import io.element.android.libraries.matrix.ui.room.LoadingRoomStateProvider import io.element.android.libraries.ui.strings.CommonStrings @@ -57,7 +58,9 @@ fun LoadingRoomNodeView( style = ElementTheme.typography.fontBodyMdRegular, ) } else { - CircularProgressIndicator() + DelayedVisibility { + CircularProgressIndicator() + } } } }, diff --git a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt index 8e73165cb6..c9eb28397e 100644 --- a/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt +++ b/appnav/src/test/kotlin/io/element/android/appnav/JoinedRoomLoadedFlowNodeTest.kt @@ -37,7 +37,10 @@ import kotlinx.coroutines.test.TestScope import kotlinx.coroutines.test.runTest import org.junit.Rule import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +@RunWith(RobolectricTestRunner::class) class JoinedRoomLoadedFlowNodeTest { @get:Rule val instantTaskExecutorRule = InstantTaskExecutorRule() @@ -140,6 +143,7 @@ class JoinedRoomLoadedFlowNodeTest { spaceEntryPoint: SpaceEntryPoint = FakeSpaceEntryPoint(), forwardEntryPoint: ForwardEntryPoint = FakeForwardEntryPoint(), activeRoomsHolder: ActiveRoomsHolder = ActiveRoomsHolder(), + matrixClient: FakeMatrixClient = FakeMatrixClient(), ) = JoinedRoomLoadedFlowNode( buildContext = BuildContext.root(savedStateMap = null), plugins = plugins, @@ -148,9 +152,9 @@ class JoinedRoomLoadedFlowNodeTest { spaceEntryPoint = spaceEntryPoint, forwardEntryPoint = forwardEntryPoint, appNavigationStateService = FakeAppNavigationStateService(), - sessionCoroutineScope = this, + sessionCoroutineScope = backgroundScope, roomGraphFactory = FakeRoomGraphFactory(), - matrixClient = FakeMatrixClient(), + matrixClient = matrixClient, activeRoomsHolder = activeRoomsHolder, ) diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt index 2e035b6299..25e055fdf3 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesEvents.kt @@ -18,6 +18,7 @@ sealed interface MessagesEvents { data class InviteDialogDismissed(val action: InviteDialogAction) : MessagesEvents data class OnUserClicked(val user: MatrixUser) : MessagesEvents data object Dismiss : MessagesEvents + data object MarkAsFullyReadAndExit : MessagesEvents } enum class InviteDialogAction { diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt index fc417fc029..25fd7f222d 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNavigator.kt @@ -23,4 +23,5 @@ interface MessagesNavigator { fun onPreviewAttachment(attachments: ImmutableList, inReplyToEventId: EventId?) fun onNavigateToRoom(roomId: RoomId, eventId: EventId?, serverNames: List) fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?) + fun onNavigateUp() } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt index d4283d19d5..3c91b97a40 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt @@ -9,6 +9,7 @@ package io.element.android.features.messages.impl import android.app.Activity import android.content.Context +import androidx.activity.compose.BackHandler import androidx.activity.compose.LocalActivity import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionLocalProvider @@ -263,6 +264,8 @@ class MessagesNode( context.toast(CommonStrings.screen_room_permalink_same_room_android) } + override fun onNavigateUp() = navigateUp() + @Composable override fun View(modifier: Modifier) { val activity = requireNotNull(LocalActivity.current) @@ -271,6 +274,11 @@ class MessagesNode( LocalTimelineItemPresenterFactories provides timelineItemPresenterFactories, ) { val state = presenter.present() + + BackHandler { + state.eventSink(MessagesEvents.MarkAsFullyReadAndExit) + } + OnLifecycleEvent { _, event -> when (event) { Lifecycle.Event.ON_PAUSE -> state.composerState.eventSink(MessageComposerEvents.SaveDraft) @@ -279,7 +287,7 @@ class MessagesNode( } MessagesView( state = state, - onBackClick = this::navigateUp, + onBackClick = { state.eventSink(MessagesEvents.MarkAsFullyReadAndExit) }, onRoomDetailsClick = this::onRoomDetailsClick, onEventContentClick = { isLive, event -> if (isLive) { diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt index 6740634c1c..503fd62fa5 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt @@ -36,6 +36,7 @@ import io.element.android.features.messages.impl.link.LinkState import io.element.android.features.messages.impl.messagecomposer.MessageComposerEvents import io.element.android.features.messages.impl.messagecomposer.MessageComposerState import io.element.android.features.messages.impl.pinned.banner.PinnedMessagesBannerState +import io.element.android.features.messages.impl.timeline.MarkAsFullyRead import io.element.android.features.messages.impl.timeline.TimelineController import io.element.android.features.messages.impl.timeline.TimelineEvents import io.element.android.features.messages.impl.timeline.TimelineState @@ -65,6 +66,7 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatcher import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState +import io.element.android.libraries.di.annotations.SessionCoroutineScope import io.element.android.libraries.featureflag.api.FeatureFlagService import io.element.android.libraries.featureflag.api.FeatureFlags import io.element.android.libraries.matrix.api.core.toThreadId @@ -93,6 +95,7 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import timber.log.Timber +import java.util.concurrent.atomic.AtomicBoolean @AssistedInject class MessagesPresenter( @@ -122,6 +125,8 @@ class MessagesPresenter( private val encryptionService: EncryptionService, private val featureFlagService: FeatureFlagService, private val addRecentEmoji: AddRecentEmoji, + private val markAsFullyRead: MarkAsFullyRead, + @SessionCoroutineScope private val sessionCoroutineScope: CoroutineScope, ) : Presenter { @AssistedFactory interface Factory { @@ -138,10 +143,13 @@ class MessagesPresenter( timelineMode = timelineController.mainTimelineMode() ) + private val markingAsReadAndExiting = AtomicBoolean(false) + @Composable override fun present(): MessagesState { htmlConverterProvider.Update() + val coroutineScope = rememberCoroutineScope() val roomInfo by room.roomInfoFlow.collectAsState() val localCoroutineScope = rememberCoroutineScope() val composerState = composerPresenter.present() @@ -239,6 +247,22 @@ class MessagesPresenter( is MessagesEvents.OnUserClicked -> { roomMemberModerationState.eventSink(RoomMemberModerationEvents.ShowActionsForUser(event.user)) } + is MessagesEvents.MarkAsFullyReadAndExit -> coroutineScope.launch { + if (!markingAsReadAndExiting.getAndSet(true)) { + val latestEventId = room.liveTimeline.getLatestEventId().getOrElse { + Timber.w(it, "Failed to get latest event id to mark as fully read") + navigator.onNavigateUp() + return@launch + } + latestEventId?.let { eventId -> + sessionCoroutineScope.launch { + markAsFullyRead(room.roomId, eventId) + } + } + navigator.onNavigateUp() + markingAsReadAndExiting.set(false) + } + } } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt index f732def95f..99a0f03651 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/threads/ThreadedMessagesNode.kt @@ -229,6 +229,8 @@ class ThreadedMessagesNode( callbacks.forEach { it.onOpenThread(threadRootId, focusedEventId) } } + override fun onNavigateUp() = navigateUp() + private fun onSendLocationClick() { callbacks.forEach { it.onSendLocationClick() } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/MarkAsFullyRead.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/MarkAsFullyRead.kt index 4bb6aecd34..1ec9cf6577 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/MarkAsFullyRead.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/MarkAsFullyRead.kt @@ -8,29 +8,26 @@ package io.element.android.features.messages.impl.timeline import dev.zacsweers.metro.ContributesBinding +import io.element.android.libraries.core.coroutine.CoroutineDispatchers import io.element.android.libraries.di.SessionScope import io.element.android.libraries.matrix.api.MatrixClient +import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.core.RoomId -import io.element.android.libraries.matrix.api.timeline.ReceiptType -import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext import timber.log.Timber interface MarkAsFullyRead { - operator fun invoke(roomId: RoomId) + suspend operator fun invoke(roomId: RoomId, eventId: EventId): Result } @ContributesBinding(SessionScope::class) class DefaultMarkAsFullyRead( private val matrixClient: MatrixClient, + private val coroutineDispatchers: CoroutineDispatchers, ) : MarkAsFullyRead { - override fun invoke(roomId: RoomId) { - matrixClient.sessionCoroutineScope.launch { - matrixClient.getRoom(roomId)?.use { room -> - room.markAsRead(receiptType = ReceiptType.FULLY_READ) - .onFailure { - Timber.e("Failed to mark room $roomId as fully read", it) - } - } + override suspend fun invoke(roomId: RoomId, eventId: EventId): Result = withContext(coroutineDispatchers.io) { + matrixClient.markRoomAsFullyRead(roomId, eventId).onFailure { + Timber.e(it, "Failed to mark room $roomId as fully read for event $eventId") } } } diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt index f03a1e8903..d71ae1e7bc 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt @@ -8,7 +8,6 @@ package io.element.android.features.messages.impl.timeline import androidx.compose.runtime.Composable -import androidx.compose.runtime.DisposableEffect import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.MutableState import androidx.compose.runtime.collectAsState @@ -85,7 +84,6 @@ class TimelinePresenter( private val resolveVerifiedUserSendFailurePresenter: Presenter, private val typingNotificationPresenter: Presenter, private val roomCallStatePresenter: Presenter, - private val markAsFullyRead: MarkAsFullyRead, private val featureFlagService: FeatureFlagService, ) : Presenter { @AssistedFactory @@ -219,12 +217,6 @@ class TimelinePresenter( } } - DisposableEffect(Unit) { - onDispose { - markAsFullyRead(room.roomId) - } - } - LaunchedEffect(Unit) { timelineItemsFactory.timelineItems .onEach { newTimelineItems -> @@ -388,7 +380,7 @@ class TimelinePresenter( ) = launch(dispatchers.computation) { // If we are at the bottom of timeline, we mark the room as read. if (firstVisibleIndex == 0) { - room.markAsRead(receiptType = readReceiptType) + room.liveTimeline.markAsRead(receiptType = readReceiptType) } else { // Get last valid EventId seen by the user, as the first index might refer to a Virtual item val eventId = getLastEventIdBeforeOrAt(firstVisibleIndex, timelineItems) diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt index bb59ca8551..c26e7a83e2 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/FakeMessagesNavigator.kt @@ -24,6 +24,7 @@ class FakeMessagesNavigator( private val onPreviewAttachmentLambda: (attachments: ImmutableList, inReplyToEventId: EventId?) -> Unit = { _, _ -> lambdaError() }, private val onNavigateToRoomLambda: (roomId: RoomId, threadId: EventId?, serverNames: List) -> Unit = { _, _, _ -> lambdaError() }, private val onOpenThreadLambda: (threadRootId: ThreadId, focusedEventId: EventId?) -> Unit = { _, _ -> lambdaError() }, + private val onNavigateUpLambda: () -> Unit = { lambdaError() }, ) : MessagesNavigator { override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) { onShowEventDebugInfoClickLambda(eventId, debugInfo) @@ -52,4 +53,8 @@ class FakeMessagesNavigator( override fun onOpenThread(threadRootId: ThreadId, focusedEventId: EventId?) { onOpenThreadLambda(threadRootId, focusedEventId) } + + override fun onNavigateUp() { + onNavigateUpLambda() + } } diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt index 34fd4df7f0..b25e097d48 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/MessagesPresenterTest.kt @@ -23,6 +23,8 @@ import io.element.android.features.messages.impl.messagecomposer.MessageComposer import io.element.android.features.messages.impl.messagecomposer.MessageComposerState import io.element.android.features.messages.impl.messagecomposer.aMessageComposerState import io.element.android.features.messages.impl.pinned.banner.aLoadedPinnedMessagesBannerState +import io.element.android.features.messages.impl.timeline.FakeMarkAsFullyRead +import io.element.android.features.messages.impl.timeline.MarkAsFullyRead import io.element.android.features.messages.impl.timeline.TimelineController import io.element.android.features.messages.impl.timeline.TimelineEvents import io.element.android.features.messages.impl.timeline.aTimelineState @@ -178,7 +180,11 @@ class MessagesPresenterTest { liveTimeline = timeline, typingNoticeResult = { Result.success(Unit) }, ) - val presenter = createMessagesPresenter(joinedRoom = room, coroutineDispatchers = coroutineDispatchers) + val presenter = createMessagesPresenter( + timeline = timeline, + joinedRoom = room, + coroutineDispatchers = coroutineDispatchers + ) presenter.testWithLifecycleOwner { skipItems(1) val initialState = awaitItem() @@ -220,7 +226,11 @@ class MessagesPresenterTest { liveTimeline = timeline, typingNoticeResult = { Result.success(Unit) }, ) - val presenter = createMessagesPresenter(joinedRoom = room, coroutineDispatchers = coroutineDispatchers) + val presenter = createMessagesPresenter( + timeline = timeline, + joinedRoom = room, + coroutineDispatchers = coroutineDispatchers + ) presenter.testWithLifecycleOwner { val initialState = awaitItem() initialState.eventSink(MessagesEvents.ToggleReaction("👍", AN_EVENT_ID.toEventOrTransactionId())) @@ -509,6 +519,7 @@ class MessagesPresenterTest { val redactEventLambda = lambdaRecorder { _: EventOrTransactionId, _: String? -> Result.success(Unit) } liveTimeline.redactEventLambda = redactEventLambda val presenter = createMessagesPresenter( + timeline = liveTimeline, joinedRoom = joinedRoom, coroutineDispatchers = coroutineDispatchers, ) @@ -920,6 +931,7 @@ class MessagesPresenterTest { typingNoticeResult = { Result.success(Unit) }, ) val presenter = createMessagesPresenter( + timeline = timeline, joinedRoom = room, analyticsService = analyticsService, ) @@ -962,7 +974,11 @@ class MessagesPresenterTest { liveTimeline = timeline, typingNoticeResult = { Result.success(Unit) }, ) - val presenter = createMessagesPresenter(joinedRoom = room, analyticsService = analyticsService) + val presenter = createMessagesPresenter( + timeline = timeline, + joinedRoom = room, + analyticsService = analyticsService + ) presenter.testWithLifecycleOwner { val messageEvent = aMessageEvent( content = aTimelineItemTextContent() @@ -1236,8 +1252,57 @@ class MessagesPresenterTest { } } + @Test + fun `present - handle MarkAsFullyReadAndExit marks the room as fully read and navigates up`() = runTest { + val markAsFullyReadRecorder = lambdaRecorder { _, _ -> } + val markAsFullyReadUseCase = FakeMarkAsFullyRead(markAsFullyReadRecorder) + val onNavigateUpRecorder = lambdaRecorder {} + val navigator = FakeMessagesNavigator(onNavigateUpLambda = onNavigateUpRecorder) + + val presenter = createMessagesPresenter( + timeline = FakeTimeline(getLatestEventIdResult = { Result.success(AN_EVENT_ID) }), + markAsFullyRead = markAsFullyReadUseCase, + navigator = navigator, + ) + presenter.testWithLifecycleOwner { + val initialState = awaitItem() + initialState.eventSink(MessagesEvents.MarkAsFullyReadAndExit) + + runCurrent() + + markAsFullyReadRecorder.assertions().isCalledOnce() + onNavigateUpRecorder.assertions().isCalledOnce() + + cancelAndIgnoreRemainingEvents() + } + } + + @Test + fun `present - handle MarkAsFullyReadAndExit still navigates up if marking as read fails`() = runTest { + val markAsFullyReadUseCase = FakeMarkAsFullyRead { _, _ -> error("boom") } + val onNavigateUpRecorder = lambdaRecorder {} + val navigator = FakeMessagesNavigator(onNavigateUpLambda = onNavigateUpRecorder) + + val presenter = createMessagesPresenter( + timeline = FakeTimeline(getLatestEventIdResult = { Result.success(AN_EVENT_ID) }), + markAsFullyRead = markAsFullyReadUseCase, + navigator = navigator, + ) + presenter.testWithLifecycleOwner { + val initialState = awaitItem() + initialState.eventSink(MessagesEvents.MarkAsFullyReadAndExit) + + runCurrent() + + onNavigateUpRecorder.assertions().isCalledOnce() + + cancelAndIgnoreRemainingEvents() + } + } + private fun TestScope.createMessagesPresenter( coroutineDispatchers: CoroutineDispatchers = testCoroutineDispatchers(), + timeline: Timeline = FakeTimeline(), joinedRoom: FakeJoinedRoom = FakeJoinedRoom( baseRoom = FakeBaseRoom( canUserSendMessageResult = { _, _ -> Result.success(true) }, @@ -1248,10 +1313,9 @@ class MessagesPresenterTest { ).apply { givenRoomInfo(aRoomInfo(id = roomId, name = "")) }, - liveTimeline = FakeTimeline(), + liveTimeline = timeline, typingNoticeResult = { Result.success(Unit) }, ), - timeline: Timeline = joinedRoom.liveTimeline, navigator: FakeMessagesNavigator = FakeMessagesNavigator(), clipboardHelper: FakeClipboardHelper = FakeClipboardHelper(), analyticsService: FakeAnalyticsService = FakeAnalyticsService(), @@ -1270,6 +1334,7 @@ class MessagesPresenterTest { featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(), actionListEventSink: (ActionListEvents) -> Unit = {}, addRecentEmoji: AddRecentEmoji = AddRecentEmoji(FakeMatrixClient(), testCoroutineDispatchers()), + markAsFullyRead: MarkAsFullyRead = FakeMarkAsFullyRead(), ): MessagesPresenter { return MessagesPresenter( navigator = navigator, @@ -1298,6 +1363,8 @@ class MessagesPresenterTest { encryptionService = encryptionService, featureFlagService = featureFlagService, addRecentEmoji = addRecentEmoji, + markAsFullyRead = markAsFullyRead, + sessionCoroutineScope = backgroundScope, ) } } diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultMarkAsFullyReadTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultMarkAsFullyReadTest.kt index 6340ce56a5..e47b2b8cd2 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultMarkAsFullyReadTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/DefaultMarkAsFullyReadTest.kt @@ -9,12 +9,15 @@ package io.element.android.features.messages.impl.timeline -import io.element.android.libraries.matrix.api.timeline.ReceiptType +import com.google.common.truth.Truth.assertThat +import io.element.android.libraries.matrix.api.core.EventId +import io.element.android.libraries.matrix.api.core.RoomId +import io.element.android.libraries.matrix.test.AN_EVENT_ID import io.element.android.libraries.matrix.test.A_ROOM_ID import io.element.android.libraries.matrix.test.FakeMatrixClient -import io.element.android.libraries.matrix.test.room.FakeBaseRoom import io.element.android.tests.testutils.lambda.lambdaRecorder import io.element.android.tests.testutils.lambda.value +import io.element.android.tests.testutils.testCoroutineDispatchers import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.runCurrent import kotlinx.coroutines.test.runTest @@ -22,34 +25,30 @@ import org.junit.Test class DefaultMarkAsFullyReadTest { @Test - fun `When room is not found, then no exception is thrown`() = runTest { + fun `When marking as read fails, no exception is thrown`() = runTest { val markAsFullyRead = DefaultMarkAsFullyRead( - FakeMatrixClient( - sessionCoroutineScope = backgroundScope, + matrixClient = FakeMatrixClient( + markRoomAsFullyReadResult = { _, _ -> Result.failure(IllegalStateException("Room not found")) }, ).apply { givenGetRoomResult(A_ROOM_ID, null) - } + }, + coroutineDispatchers = testCoroutineDispatchers(), ) - markAsFullyRead.invoke(A_ROOM_ID) + assertThat(markAsFullyRead.invoke(A_ROOM_ID, AN_EVENT_ID).isFailure).isTrue() runCurrent() } @Test - fun `When room is found, the expected method is invoked`() = runTest { - val markAsReadResult = lambdaRecorder> { Result.success(Unit) } - val baseRoom = FakeBaseRoom( - markAsReadResult = markAsReadResult - ) + fun `When marking as read is successful, the expected method is invoked`() = runTest { + val markAsFullyReadResult = lambdaRecorder> { _, _ -> Result.success(Unit) } val markAsFullyRead = DefaultMarkAsFullyRead( - FakeMatrixClient( - sessionCoroutineScope = backgroundScope, - ).apply { - givenGetRoomResult(A_ROOM_ID, baseRoom) - } + matrixClient = FakeMatrixClient( + markRoomAsFullyReadResult = markAsFullyReadResult, + ), + coroutineDispatchers = testCoroutineDispatchers(), ) - markAsFullyRead.invoke(A_ROOM_ID) + assertThat(markAsFullyRead.invoke(A_ROOM_ID, AN_EVENT_ID).isSuccess).isTrue() runCurrent() - markAsReadResult.assertions().isCalledOnce().with(value(ReceiptType.FULLY_READ)) - baseRoom.assertDestroyed() + markAsFullyReadResult.assertions().isCalledOnce().with(value(A_ROOM_ID), value(AN_EVENT_ID)) } } diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/FakeMarkAsFullyRead.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/FakeMarkAsFullyRead.kt index 895676a126..85e07bea69 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/FakeMarkAsFullyRead.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/FakeMarkAsFullyRead.kt @@ -7,13 +7,15 @@ package io.element.android.features.messages.impl.timeline +import io.element.android.libraries.core.extensions.runCatchingExceptions +import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.tests.testutils.lambda.lambdaError class FakeMarkAsFullyRead( - private val invokeResult: (RoomId) -> Unit = { lambdaError() } + private val invokeResult: (RoomId, EventId) -> Unit = { _, _ -> lambdaError() }, ) : MarkAsFullyRead { - override fun invoke(roomId: RoomId) { - invokeResult(roomId) + override suspend fun invoke(roomId: RoomId, eventId: EventId): Result { + return runCatchingExceptions { invokeResult(roomId, eventId) } } } diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt index 8da614f67e..b264da5566 100644 --- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt +++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenterTest.kt @@ -151,19 +151,21 @@ class TimelinePresenterTest { isSendPublicReadReceiptsEnabled: Boolean, expectedReceiptType: ReceiptType, ) = runTest(StandardTestDispatcher()) { + val markAsReadResult = lambdaRecorder> { Result.success(Unit) } + val sendReadReceiptLambda = lambdaRecorder> { _, _ -> Result.success(Unit) } val timeline = FakeTimeline( timelineItems = flowOf( listOf( MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem()) ) - ) + ), + markAsReadResult = markAsReadResult, + sendReadReceiptLambda = sendReadReceiptLambda, ) - val markAsReadResult = lambdaRecorder> { Result.success(Unit) } val room = FakeJoinedRoom( liveTimeline = timeline, baseRoom = FakeBaseRoom( canUserSendMessageResult = { _, _ -> Result.success(true) }, - markAsReadResult = markAsReadResult, ) ) val sessionPreferencesStore = InMemorySessionPreferencesStore(isSendPublicReadReceiptsEnabled = isSendPublicReadReceiptsEnabled) @@ -185,25 +187,6 @@ class TimelinePresenterTest { } } - @Test - fun `present - once presenter is disposed, room is marked as fully read`() = runTest { - val invokeResult = lambdaRecorder { } - val presenter = createTimelinePresenter( - room = FakeJoinedRoom( - baseRoom = FakeBaseRoom( - canUserSendMessageResult = { _, _ -> Result.success(true) }, - ) - ), - markAsFullyRead = FakeMarkAsFullyRead( - invokeResult = invokeResult, - ) - ) - presenter.test { - awaitFirstItem() - } - invokeResult.assertions().isCalledOnce().with(value(A_ROOM_ID)) - } - @Test fun `present - on scroll finished send read receipt if an event is before the index`() = runTest { val sendReadReceiptsLambda = lambdaRecorder { _: EventId, _: ReceiptType -> @@ -258,10 +241,10 @@ class TimelinePresenterTest { ) ) ) - ) - ).apply { - this.sendReadReceiptLambda = sendReadReceiptsLambda - } + ), + markAsReadResult = { Result.success(Unit) }, + sendReadReceiptLambda = sendReadReceiptsLambda, + ) val sessionPreferencesStore = InMemorySessionPreferencesStore(isSendPublicReadReceiptsEnabled = false) val presenter = createTimelinePresenter( timeline = timeline, @@ -349,7 +332,10 @@ class TimelinePresenterTest { @Test fun `present - covers newEventState scenarios`() = runTest { val timelineItems = MutableStateFlow(emptyList()) - val timeline = FakeTimeline(timelineItems = timelineItems) + val timeline = FakeTimeline( + timelineItems = timelineItems, + markAsReadResult = { Result.success(Unit) }, + ) val presenter = createTimelinePresenter(timeline) moleculeFlow(RecompositionMode.Immediate) { presenter.present() @@ -1039,7 +1025,6 @@ class TimelinePresenterTest { sendPollResponseAction: SendPollResponseAction = FakeSendPollResponseAction(), sessionPreferencesStore: InMemorySessionPreferencesStore = InMemorySessionPreferencesStore(), timelineItemIndexer: TimelineItemIndexer = TimelineItemIndexer(), - markAsFullyRead: MarkAsFullyRead = FakeMarkAsFullyRead(), featureFlagService: FakeFeatureFlagService = FakeFeatureFlagService(), ): TimelinePresenter { return TimelinePresenter( @@ -1057,7 +1042,6 @@ class TimelinePresenterTest { resolveVerifiedUserSendFailurePresenter = { aResolveVerifiedUserSendFailureState() }, typingNotificationPresenter = { aTypingNotificationState() }, roomCallStatePresenter = { aStandByCallState() }, - markAsFullyRead = markAsFullyRead, featureFlagService = featureFlagService, ) } diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DelayedVisibility.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DelayedVisibility.kt new file mode 100644 index 0000000000..e1617e0fd2 --- /dev/null +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/DelayedVisibility.kt @@ -0,0 +1,46 @@ +/* + * Copyright 2025 New Vector Ltd. + * + * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial + * Please see LICENSE files in the repository root for full details. + */ + +package io.element.android.libraries.designsystem.utils + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.movableContentOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.platform.LocalInspectionMode +import kotlinx.coroutines.delay +import kotlin.time.Duration +import kotlin.time.Duration.Companion.milliseconds + +/** + * Displays the content of [block] after a delay of [duration]. + */ +@Composable +fun DelayedVisibility( + duration: Duration = 300.milliseconds, + block: @Composable () -> Unit, +) { + // Technically this shouldn't be needed because `LocalInspectionMode` won't change, but let's make the linter happy + val movableBlock = remember { movableContentOf { block() } } + if (LocalInspectionMode.current) { + // Just allow the contents to be displayed in the previews/screenshot tests + movableBlock() + } else { + var shouldDisplay by remember { mutableStateOf(false) } + LaunchedEffect(Unit) { + delay(duration) + shouldDisplay = true + } + AnimatedVisibility(shouldDisplay) { + movableBlock() + } + } +} diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt index 5f116612b1..55a594f2cc 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt @@ -9,6 +9,7 @@ package io.element.android.libraries.matrix.api import io.element.android.libraries.core.data.tryOrNull import io.element.android.libraries.matrix.api.core.DeviceId +import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.core.MatrixPatterns import io.element.android.libraries.matrix.api.core.RoomAlias import io.element.android.libraries.matrix.api.core.RoomId @@ -34,6 +35,7 @@ import io.element.android.libraries.matrix.api.roomlist.RoomListService import io.element.android.libraries.matrix.api.spaces.SpaceService import io.element.android.libraries.matrix.api.sync.SlidingSyncVersion import io.element.android.libraries.matrix.api.sync.SyncService +import io.element.android.libraries.matrix.api.timeline.Timeline import io.element.android.libraries.matrix.api.user.MatrixSearchUserResults import io.element.android.libraries.matrix.api.user.MatrixUser import io.element.android.libraries.matrix.api.verification.SessionVerificationService @@ -183,6 +185,14 @@ interface MatrixClient { * Adds an emoji to the list of recent emoji reactions for this account. */ suspend fun addRecentEmoji(emoji: String): Result + + /** + * Marks the room with the provided [roomId] as read, sending a fully read receipt for [eventId]. + * + * This method should be used with caution as providing the [eventId] ourselves can result in incorrect read receipts. + * Use [Timeline.markAsRead] instead when possible. + */ + suspend fun markRoomAsFullyRead(roomId: RoomId, eventId: EventId): Result } /** diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt index 6a2871dc56..f6eda0ee5a 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/auth/qrlogin/QrLoginException.kt @@ -16,7 +16,7 @@ sealed class QrLoginException : Exception() { data object OidcMetadataInvalid : QrLoginException() data object SlidingSyncNotAvailable : QrLoginException() data object OtherDeviceNotSignedIn : QrLoginException() - data object Unknown : QrLoginException() data object CheckCodeAlreadySent : QrLoginException() data object CheckCodeCannotBeSent : QrLoginException() + data object Unknown : QrLoginException() } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt index 2694191f89..1e82320d94 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/BaseRoom.kt @@ -17,6 +17,7 @@ import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsV import io.element.android.libraries.matrix.api.room.tombstone.PredecessorRoom import io.element.android.libraries.matrix.api.roomdirectory.RoomVisibility import io.element.android.libraries.matrix.api.timeline.ReceiptType +import io.element.android.libraries.matrix.api.timeline.Timeline import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.StateFlow @@ -180,6 +181,10 @@ interface BaseRoom : Closeable { /** * Mark the room as read by trying to attach an unthreaded read receipt to the latest room event. + * + * Note this will instantiate a new timeline, which is an expensive operation. + * Prefer using [Timeline.markAsRead] instead when possible. + * * @param receiptType The type of receipt to send. */ suspend fun markAsRead(receiptType: ReceiptType): Result diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt index ad526fa787..0306bd5fe2 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt @@ -55,6 +55,7 @@ interface Timeline : AutoCloseable { val mode: Mode val membershipChangeEventReceived: Flow suspend fun sendReadReceipt(eventId: EventId, receiptType: ReceiptType): Result + suspend fun markAsRead(receiptType: ReceiptType): Result suspend fun paginate(direction: PaginationDirection): Result val backwardPaginationStatus: StateFlow @@ -227,4 +228,9 @@ interface Timeline : AutoCloseable { * pinned */ suspend fun unpinEvent(eventId: EventId): Result + + /** + * Get the latest event id of the timeline. + */ + suspend fun getLatestEventId(): Result } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt index 94a562c160..617e8e72e3 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt @@ -17,6 +17,7 @@ import io.element.android.libraries.core.extensions.runCatchingExceptions import io.element.android.libraries.featureflag.api.FeatureFlagService import io.element.android.libraries.matrix.api.MatrixClient import io.element.android.libraries.matrix.api.core.DeviceId +import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.core.RoomAlias import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.RoomIdOrAlias @@ -713,6 +714,13 @@ class RustMatrixClient( } } + override suspend fun markRoomAsFullyRead(roomId: RoomId, eventId: EventId): Result = withContext(sessionDispatcher) { + runCatchingExceptions { + val room = innerClient.getRoom(roomId.value) ?: error("Could not fetch associated room") + room.markAsFullyReadUnchecked(eventId.value) + } + } + private suspend fun getCacheSize( includeCryptoDb: Boolean = false, ): Long = withContext(sessionDispatcher) { diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt index baa9f85906..4622073950 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/JoinedRustRoom.kt @@ -473,6 +473,7 @@ class JoinedRustRoom( override fun destroy() { baseRoom.destroy() liveInnerTimeline.destroy() + Timber.d("Room $roomId destroyed") } private fun InnerTimeline.map( diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt index ba63cd2ef0..a488341060 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt @@ -159,6 +159,12 @@ class RustTimeline( } } + override suspend fun markAsRead(receiptType: ReceiptType): Result = withContext(dispatcher) { + runCatchingExceptions { + inner.markAsRead(receiptType.toRustReceiptType()) + } + } + private fun updatePaginationStatus(direction: Timeline.PaginationDirection, update: (Timeline.PaginationStatus) -> Timeline.PaginationStatus) { when (direction) { Timeline.PaginationDirection.BACKWARDS -> backwardPaginationStatus.getAndUpdate(update) @@ -586,6 +592,12 @@ class RustTimeline( } } + override suspend fun getLatestEventId(): Result = withContext(dispatcher) { + runCatchingExceptions { + inner.latestEventId()?.let(::EventId) + } + } + private suspend fun fetchDetailsForEvent(eventId: EventId): Result = withContext(dispatcher) { runCatchingExceptions { inner.fetchDetailsForEvent(eventId.value) diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt index f0e296ea5d..07dc8e9a9e 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt @@ -9,6 +9,7 @@ package io.element.android.libraries.matrix.test import io.element.android.libraries.matrix.api.MatrixClient import io.element.android.libraries.matrix.api.core.DeviceId +import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.core.RoomAlias import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.RoomIdOrAlias @@ -101,6 +102,7 @@ class FakeMatrixClient( private val getJoinedRoomIdsResult: () -> Result> = { Result.success(emptySet()) }, private val getRecentEmojisLambda: () -> Result> = { Result.success(emptyList()) }, private val addRecentEmojiLambda: (String) -> Result = { Result.success(Unit) }, + private val markRoomAsFullyReadResult: (RoomId, EventId) -> Result = { _, _ -> lambdaError() }, ) : MatrixClient { var setDisplayNameCalled: Boolean = false private set @@ -344,4 +346,8 @@ class FakeMatrixClient( override suspend fun getRecentEmojis(): Result> { return getRecentEmojisLambda() } + + override suspend fun markRoomAsFullyRead(roomId: RoomId, eventId: EventId): Result { + return markRoomAsFullyReadResult(roomId, eventId) + } } diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt index 6ebd9f9f50..dfbe5d52ae 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/timeline/FakeTimeline.kt @@ -49,6 +49,14 @@ class FakeTimeline( override val membershipChangeEventReceived: Flow = MutableSharedFlow(), private val cancelSendResult: (TransactionId) -> Result = { lambdaError() }, override val mode: Timeline.Mode = Timeline.Mode.Live, + private val markAsReadResult: (ReceiptType) -> Result = { lambdaError() }, + private val getLatestEventIdResult: () -> Result = { lambdaError() }, + var sendReadReceiptLambda: ( + eventId: EventId, + receiptType: ReceiptType, + ) -> Result = { _, _ -> + lambdaError() + } ) : Timeline { var sendMessageLambda: ( body: String, @@ -397,18 +405,15 @@ class FakeTimeline( ) } - var sendReadReceiptLambda: ( - eventId: EventId, - receiptType: ReceiptType, - ) -> Result = { _, _ -> - lambdaError() - } - override suspend fun sendReadReceipt( eventId: EventId, receiptType: ReceiptType, ): Result = sendReadReceiptLambda(eventId, receiptType) + override suspend fun markAsRead(receiptType: ReceiptType): Result { + return markAsReadResult(receiptType) + } + var paginateLambda: (direction: Timeline.PaginationDirection) -> Result = { Result.success(false) } @@ -431,6 +436,10 @@ class FakeTimeline( return unpinEventLambda(eventId) } + override suspend fun getLatestEventId(): Result { + return getLatestEventIdResult() + } + var closeCounter = 0 private set