Pinned messages list : improve and fix code after PR review.

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -36,7 +36,6 @@ import com.bumble.appyx.core.plugin.plugins
 import com.bumble.appyx.navmodel.backstack.BackStack
 import com.bumble.appyx.navmodel.backstack.operation.push
 import com.bumble.appyx.navmodel.backstack.operation.replace
-import com.bumble.appyx.navmodel.backstack.operation.singleTop
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import im.vector.app.features.analytics.plan.JoinedRoom
@@ -86,6 +85,7 @@ import kotlinx.coroutines.launch
 import kotlinx.parcelize.Parcelize
 import timber.log.Timber
 import java.util.Optional
+import java.util.UUID
 
 @ContributesNode(SessionScope::class)
 class LoggedInFlowNode @AssistedInject constructor(
@@ -204,7 +204,8 @@ class LoggedInFlowNode @AssistedInject constructor(
             val serverNames: List<String> = emptyList(),
             val trigger: JoinedRoom.Trigger? = null,
             val roomDescription: RoomDescription? = null,
-            val initialElement: RoomNavigationTarget = RoomNavigationTarget.Messages()
+            val initialElement: RoomNavigationTarget = RoomNavigationTarget.Messages(),
+            val targetId: UUID = UUID.randomUUID(),
         ) : NavTarget
 
         @Parcelize
@@ -311,7 +312,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                                 if (pushToBackstack) {
                                     backstack.push(target)
                                 } else {
-                                    backstack.singleTop(target)
+                                    backstack.replace(target)
                                 }
                             }
                             is PermalinkData.FallbackLink,

features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt

@@ -46,7 +46,7 @@ interface MessagesEntryPoint : FeatureEntryPoint {
     interface Callback : Plugin {
         fun onRoomDetailsClick()
         fun onUserDataClick(userId: UserId)
-        fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean = true)
+        fun onPermalinkClick(data: PermalinkData, pushToBackstack: Boolean)
         fun onForwardedToSingleRoom(roomId: RoomId)
     }
 

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt

@@ -194,7 +194,7 @@ class MessagesFlowNode @AssistedInject constructor(
                     }
 
                     override fun onPermalinkClick(data: PermalinkData) {
-                        callbacks.forEach { it.onPermalinkClick(data) }
+                        callbacks.forEach { it.onPermalinkClick(data, pushToBackstack = true) }
                     }
 
                     override fun onShowEventDebugInfoClick(eventId: EventId?, debugInfo: TimelineItemDebugInfo) {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenter.kt

@@ -74,7 +74,7 @@ class PinnedMessagesListPresenter @AssistedInject constructor(
         fun create(navigator: PinnedMessagesListNavigator): PinnedMessagesListPresenter
     }
 
-    private val actionListPresenter = actionListPresenterFactory.create(PinnedMessagesListTimelineActionPostProcessor)
+    private val actionListPresenter = actionListPresenterFactory.create(PinnedMessagesListTimelineActionPostProcessor())
 
     @Composable
     override fun present(): PinnedMessagesListState {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListStateProvider.kt

@@ -21,10 +21,17 @@ import io.element.android.features.messages.impl.UserEventPermissions
 import io.element.android.features.messages.impl.actionlist.ActionListState
 import io.element.android.features.messages.impl.actionlist.anActionListState
 import io.element.android.features.messages.impl.timeline.TimelineRoomInfo
-import io.element.android.features.messages.impl.timeline.aTimelineItemList
+import io.element.android.features.messages.impl.timeline.aTimelineItemDaySeparator
+import io.element.android.features.messages.impl.timeline.aTimelineItemEvent
+import io.element.android.features.messages.impl.timeline.aTimelineItemReactions
 import io.element.android.features.messages.impl.timeline.aTimelineRoomInfo
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
+import io.element.android.features.messages.impl.timeline.model.TimelineItemGroupPosition
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemAudioContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemFileContent
+import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemPollContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
+import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 
 open class PinnedMessagesListStateProvider : PreviewParameterProvider<PinnedMessagesListState> {
@@ -34,7 +41,45 @@ open class PinnedMessagesListStateProvider : PreviewParameterProvider<PinnedMess
             aLoadingPinnedMessagesListState(),
             anEmptyPinnedMessagesListState(),
             aLoadedPinnedMessagesListState(
-                timelineItems = aTimelineItemList(aTimelineItemTextContent())
+                timelineItems = persistentListOf(
+                    aTimelineItemEvent(
+                        isMine = false,
+                        content = aTimelineItemTextContent("A pinned message"),
+                        groupPosition = TimelineItemGroupPosition.Last,
+                        timelineItemReactions = aTimelineItemReactions(0)
+                    ),
+                    aTimelineItemEvent(
+                        isMine = false,
+                        content = aTimelineItemAudioContent("A pinned file"),
+                        groupPosition = TimelineItemGroupPosition.Middle,
+                        timelineItemReactions = aTimelineItemReactions(0)
+                    ),
+                    aTimelineItemEvent(
+                        isMine = false,
+                        content = aTimelineItemPollContent("A pinned poll?"),
+                        groupPosition = TimelineItemGroupPosition.First,
+                        timelineItemReactions = aTimelineItemReactions(0)
+                    ),
+                    aTimelineItemDaySeparator(),
+                    aTimelineItemEvent(
+                        isMine = true,
+                        content = aTimelineItemTextContent("A pinned message"),
+                        groupPosition = TimelineItemGroupPosition.Last,
+                        timelineItemReactions = aTimelineItemReactions(0)
+                    ),
+                    aTimelineItemEvent(
+                        isMine = true,
+                        content = aTimelineItemFileContent("A pinned file?"),
+                        groupPosition = TimelineItemGroupPosition.Middle,
+                        timelineItemReactions = aTimelineItemReactions(0)
+                    ),
+                    aTimelineItemEvent(
+                        isMine = true,
+                        content = aTimelineItemPollContent("A pinned poll?"),
+                        groupPosition = TimelineItemGroupPosition.First,
+                        timelineItemReactions = aTimelineItemReactions(0)
+                    ),
+                )
             )
         )
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListTimelineActionPostProcessor.kt

@@ -19,21 +19,14 @@ package io.element.android.features.messages.impl.pinned.list
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.impl.actionlist.model.TimelineItemActionPostProcessor
 
-object PinnedMessagesListTimelineActionPostProcessor : TimelineItemActionPostProcessor {
+class PinnedMessagesListTimelineActionPostProcessor : TimelineItemActionPostProcessor {
     override fun process(actions: List<TimelineItemAction>): List<TimelineItemAction> {
         return buildList {
             add(TimelineItemAction.ViewInTimeline)
-            addAll(actions.filter(::predicate))
+            actions.firstOrNull { it is TimelineItemAction.Unpin }?.let(::add)
-        }
+            actions.firstOrNull { it is TimelineItemAction.Forward }?.let(::add)
-    }
+            actions.firstOrNull { it is TimelineItemAction.ViewSource }?.let(::add)
-
+            actions.firstOrNull { it is TimelineItemAction.Redact }?.let(::add)
-    private fun predicate(action: TimelineItemAction): Boolean {
-        return when (action) {
-            is TimelineItemAction.Unpin,
-            is TimelineItemAction.Redact,
-            is TimelineItemAction.Forward,
-            is TimelineItemAction.ViewSource -> true
-            else -> false
         }
     }
 }

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/pinned/list/PinnedMessagesListPresenterTest.kt

@@ -33,6 +33,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
+import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.A_UNIQUE_ID
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
@@ -172,10 +173,10 @@ class PinnedMessagesListPresenterTest {
 
     @Test
     fun `present - unpin event`() = runTest {
-        val unpinEventLambda = lambdaRecorder { _: EventId? -> Result.success(true) }
+        val successUnpinEventLambda = lambdaRecorder { _: EventId? -> Result.success(true) }
-        val pinnedEventsTimeline = createPinnedMessagesTimeline().apply {
+        val failureUnpinEventLambda = lambdaRecorder { _: EventId? -> Result.failure<Boolean>(A_THROWABLE) }
-            this.unpinEventLambda = unpinEventLambda
+        val pinnedEventsTimeline = createPinnedMessagesTimeline()
-        }
+
         val room = FakeMatrixRoom(
             pinnedEventsTimelineResult = { Result.success(pinnedEventsTimeline) },
             canRedactOwnResult = { Result.success(true) },
@@ -189,9 +190,20 @@ class PinnedMessagesListPresenterTest {
             skipItems(3)
             val filledState = awaitItem() as PinnedMessagesListState.Filled
             val eventItem = filledState.timelineItems.first() as TimelineItem.Event
+
+            pinnedEventsTimeline.unpinEventLambda = successUnpinEventLambda
             filledState.eventSink(PinnedMessagesListEvents.HandleAction(TimelineItemAction.Unpin, eventItem))
+
+            pinnedEventsTimeline.unpinEventLambda = failureUnpinEventLambda
+            filledState.eventSink(PinnedMessagesListEvents.HandleAction(TimelineItemAction.Unpin, eventItem))
+
             cancelAndIgnoreRemainingEvents()
-            assert(unpinEventLambda)
+
+            assert(successUnpinEventLambda)
+                .isCalledOnce()
+                .with(value(AN_EVENT_ID))
+
+            assert(failureUnpinEventLambda)
                 .isCalledOnce()
                 .with(value(AN_EVENT_ID))
         }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt

@@ -50,7 +50,7 @@ interface Timeline : AutoCloseable {
     enum class Mode {
         LIVE,
         FOCUSED_ON_EVENT,
-        FOCUSED_ON_PINNED_EVENTS
+        PINNED_EVENTS
     }
 
     val membershipChangeEventReceived: Flow<Unit>

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt

@@ -199,7 +199,7 @@ class RustMatrixRoom(
                 internalIdPrefix = "pinned_events",
                 maxEventsToLoad = 100u,
             ).let { inner ->
-                createTimeline(inner, mode = Timeline.Mode.FOCUSED_ON_PINNED_EVENTS)
+                createTimeline(inner, mode = Timeline.Mode.PINNED_EVENTS)
             }
         }.onFailure {
             if (it is CancellationException) {

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustTimeline.kt

@@ -137,7 +137,7 @@ class RustTimeline(
     private val lastForwardIndicatorsPostProcessor = LastForwardIndicatorsPostProcessor(mode)
 
     private val backPaginationStatus = MutableStateFlow(
-        Timeline.PaginationStatus(isPaginating = false, hasMoreToLoad = mode != Timeline.Mode.FOCUSED_ON_PINNED_EVENTS)
+        Timeline.PaginationStatus(isPaginating = false, hasMoreToLoad = mode != Timeline.Mode.PINNED_EVENTS)
     )
 
     private val forwardPaginationStatus = MutableStateFlow(

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessor.kt

@@ -37,7 +37,7 @@ class RoomBeginningPostProcessor(private val mode: Timeline.Mode) {
         hasMoreToLoadBackwards: Boolean
     ): List<MatrixTimelineItem> {
         return when {
-            mode == Timeline.Mode.FOCUSED_ON_PINNED_EVENTS -> items
+            mode == Timeline.Mode.PINNED_EVENTS -> items
             hasMoreToLoadBackwards -> items
             isDm -> processForDM(items)
             else -> processForRoom(items)