Timeline : remove the encrypted history banner for now.

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

@@ -87,7 +87,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
-import org.matrix.rustcomponents.sdk.BackupState
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientException
 import org.matrix.rustcomponents.sdk.IgnoredUsersListener
@@ -179,7 +178,6 @@ class RustMatrixClient(
         systemClock = clock,
         roomContentForwarder = RoomContentForwarder(innerRoomListService),
         roomSyncSubscriber = roomSyncSubscriber,
-        isKeyBackupEnabled = { client.encryption().use { it.backupState() == BackupState.ENABLED } },
         getSessionData = { sessionStore.getSession(sessionId.value)!! },
     )
 

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

@@ -89,7 +89,6 @@ import org.matrix.rustcomponents.sdk.Timeline as InnerTimeline
 @OptIn(ExperimentalCoroutinesApi::class)
 class RustMatrixRoom(
     override val sessionId: SessionId,
-    private val isKeyBackupEnabled: Boolean,
     private val roomListItem: RoomListItem,
     private val innerRoom: InnerRoom,
     innerTimeline: InnerTimeline,
@@ -652,16 +651,14 @@ class RustMatrixRoom(
     ): Timeline {
         val timelineCoroutineScope = roomCoroutineScope.childScope(coroutineDispatchers.main, "TimelineScope-$roomId-$timeline")
         return RustTimeline(
-            isKeyBackupEnabled = isKeyBackupEnabled,
             mode = mode,
             matrixRoom = this,
+            inner = timeline,
             systemClock = systemClock,
             coroutineScope = timelineCoroutineScope,
             dispatcher = roomDispatcher,
-            lastLoginTimestamp = sessionData.loginTimestamp,
-            onNewSyncedEvent = onNewSyncedEvent,
             roomContentForwarder = roomContentForwarder,
-            inner = timeline,
+            onNewSyncedEvent = onNewSyncedEvent,
         )
     }
 }

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

@@ -46,7 +46,6 @@ class RustRoomFactory(
     private val roomListService: RoomListService,
     private val innerRoomListService: InnerRoomListService,
     private val roomSyncSubscriber: RoomSyncSubscriber,
-    private val isKeyBackupEnabled: suspend () -> Boolean,
     private val getSessionData: suspend () -> SessionData,
 ) {
     @OptIn(ExperimentalCoroutinesApi::class)
@@ -109,7 +108,6 @@ class RustRoomFactory(
             val liveTimeline = roomReferences.fullRoom.timeline()
             RustMatrixRoom(
                 sessionId = sessionId,
-                isKeyBackupEnabled = isKeyBackupEnabled(),
                 roomListItem = roomReferences.roomListItem,
                 innerRoom = roomReferences.fullRoom,
                 innerTimeline = liveTimeline,

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

@@ -40,7 +40,6 @@ import io.element.android.libraries.matrix.impl.timeline.item.virtual.VirtualTim
 import io.element.android.libraries.matrix.impl.timeline.postprocessor.LastForwardIndicatorsPostProcessor
 import io.element.android.libraries.matrix.impl.timeline.postprocessor.LoadingIndicatorsPostProcessor
 import io.element.android.libraries.matrix.impl.timeline.postprocessor.RoomBeginningPostProcessor
-import io.element.android.libraries.matrix.impl.timeline.postprocessor.TimelineEncryptedHistoryPostProcessor
 import io.element.android.libraries.matrix.impl.timeline.reply.InReplyToMapper
 import io.element.android.libraries.matrix.impl.util.MessageEventContent
 import io.element.android.services.toolbox.api.systemclock.SystemClock
@@ -70,7 +69,6 @@ import org.matrix.rustcomponents.sdk.use
 import timber.log.Timber
 import uniffi.matrix_sdk_ui.LiveBackPaginationStatus
 import java.io.File
-import java.util.Date
 import org.matrix.rustcomponents.sdk.Timeline as InnerTimeline
 
 private const val PAGINATION_SIZE = 50
@@ -79,11 +77,9 @@ class RustTimeline(
     private val inner: InnerTimeline,
     mode: Timeline.Mode,
     systemClock: SystemClock,
-    isKeyBackupEnabled: Boolean,
     private val matrixRoom: MatrixRoom,
     private val coroutineScope: CoroutineScope,
     private val dispatcher: CoroutineDispatcher,
-    lastLoginTimestamp: Date?,
     private val roomContentForwarder: RoomContentForwarder,
     onNewSyncedEvent: () -> Unit,
 ) : Timeline {
@@ -107,12 +103,6 @@ class RustTimeline(
         timelineItems = _timelineItems,
         timelineItemFactory = timelineItemMapper,
     )
-    private val encryptedHistoryPostProcessor = TimelineEncryptedHistoryPostProcessor(
-        lastLoginTimestamp = lastLoginTimestamp,
-        isRoomEncrypted = matrixRoom.isEncrypted,
-        isKeyBackupEnabled = isKeyBackupEnabled,
-        dispatcher = dispatcher,
-    )
     private val timelineItemsSubscriber = TimelineItemsSubscriber(
         timeline = inner,
         timelineCoroutineScope = coroutineScope,
@@ -219,7 +209,6 @@ class RustTimeline(
     ) { timelineItems, hasMoreToLoadBackward, hasMoreToLoadForward, isInit ->
         withContext(dispatcher) {
             timelineItems
-                .process { items -> encryptedHistoryPostProcessor.process(items) }
                 .process { items ->
                     roomBeginningPostProcessor.process(
                         items = items,

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

@@ -1,17 +0,0 @@
-/*
- * Copyright 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- * Please see LICENSE in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.timeline.postprocessor
-
-import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
-import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
-
-internal fun List<MatrixTimelineItem>.hasEncryptionHistoryBanner(): Boolean {
-    val firstItem = firstOrNull()
-    return firstItem is MatrixTimelineItem.Virtual &&
-        firstItem.virtual is VirtualTimelineItem.EncryptedHistoryBanner
-}

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

@@ -19,11 +19,10 @@ class LoadingIndicatorsPostProcessor(private val systemClock: SystemClock) {
         hasMoreToLoadBackward: Boolean,
         hasMoreToLoadForward: Boolean,
     ): List<MatrixTimelineItem> {
-        val shouldAddBackwardLoadingIndicator = hasMoreToLoadBackward && !items.hasEncryptionHistoryBanner()
         val shouldAddForwardLoadingIndicator = hasMoreToLoadForward && items.isNotEmpty()
         val currentTimestamp = systemClock.epochMillis()
         return buildList {
-            if (shouldAddBackwardLoadingIndicator) {
+            if (hasMoreToLoadBackward) {
                 val backwardLoadingIndicator = MatrixTimelineItem.Virtual(
                     uniqueId = UniqueId("BackwardLoadingIndicator"),
                     virtual = VirtualTimelineItem.LoadingIndicator(

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

@@ -36,7 +36,6 @@ class RoomBeginningPostProcessor(private val mode: Timeline.Mode) {
     }
 
     private fun processForRoom(items: List<MatrixTimelineItem>): List<MatrixTimelineItem> {
-        if (items.hasEncryptionHistoryBanner()) return items
         val roomBeginningItem = createRoomBeginningItem()
         return listOf(roomBeginningItem) + items
     }

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

@@ -1,55 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- * Please see LICENSE in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.timeline.postprocessor
-
-import io.element.android.libraries.matrix.api.core.UniqueId
-import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
-import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
-import timber.log.Timber
-import java.util.Date
-
-internal val encryptedHistoryBannerId = UniqueId("EncryptedHistoryBannerId")
-
-class TimelineEncryptedHistoryPostProcessor(
-    private val dispatcher: CoroutineDispatcher,
-    private val lastLoginTimestamp: Date?,
-    private val isRoomEncrypted: Boolean,
-    private val isKeyBackupEnabled: Boolean,
-) {
-    suspend fun process(items: List<MatrixTimelineItem>): List<MatrixTimelineItem> = withContext(dispatcher) {
-        Timber.d("Process on Thread=${Thread.currentThread()}")
-        if (!isRoomEncrypted || isKeyBackupEnabled || lastLoginTimestamp == null) return@withContext items
-        replaceWithEncryptionHistoryBannerIfNeeded(items)
-    }
-
-    private fun replaceWithEncryptionHistoryBannerIfNeeded(list: List<MatrixTimelineItem>): List<MatrixTimelineItem> {
-        var lastEncryptedHistoryBannerIndex = -1
-        for ((i, item) in list.withIndex()) {
-            if (isItemEncryptionHistory(item)) {
-                lastEncryptedHistoryBannerIndex = i
-            }
-        }
-        return if (lastEncryptedHistoryBannerIndex >= 0) {
-            val sublist = list.drop(lastEncryptedHistoryBannerIndex + 1).toMutableList()
-            sublist.add(0, MatrixTimelineItem.Virtual(encryptedHistoryBannerId, VirtualTimelineItem.EncryptedHistoryBanner))
-            sublist
-        } else {
-            list
-        }
-    }
-
-    private fun isItemEncryptionHistory(item: MatrixTimelineItem): Boolean {
-        if ((item as? MatrixTimelineItem.Virtual)?.virtual is VirtualTimelineItem.EncryptedHistoryBanner) {
-            return true
-        }
-        val timestamp = (item as? MatrixTimelineItem.Event)?.event?.timestamp ?: return false
-        return timestamp <= lastLoginTimestamp!!.time
-    }
-}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/RoomBeginningPostProcessorTest.kt

@@ -15,7 +15,6 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MembershipCha
 import io.element.android.libraries.matrix.api.timeline.item.event.OtherState
 import io.element.android.libraries.matrix.api.timeline.item.event.RoomMembershipContent
 import io.element.android.libraries.matrix.api.timeline.item.event.StateContent
-import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_ID_2
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
@@ -70,16 +69,6 @@ class RoomBeginningPostProcessorTest {
         )
     }
 
-    @Test
-    fun `processor will not add beginning of room item if it's not a DM and EncryptedHistoryBanner item is found`() {
-        val timelineItems = listOf(
-            MatrixTimelineItem.Virtual(UniqueId("EncryptedHistoryBanner"), VirtualTimelineItem.EncryptedHistoryBanner),
-        )
-        val processor = RoomBeginningPostProcessor(Timeline.Mode.LIVE)
-        val processedItems = processor.process(timelineItems, isDm = false, hasMoreToLoadBackwards = false)
-        assertThat(processedItems).isEqualTo(timelineItems)
-    }
-
     @Test
     fun `processor won't remove items if it's not at the start of the timeline`() {
         val timelineItems = listOf(

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/timeline/postprocessor/TimelineEncryptedHistoryPostProcessorTest.kt

@@ -1,114 +0,0 @@
-/*
- * Copyright 2023, 2024 New Vector Ltd.
- *
- * SPDX-License-Identifier: AGPL-3.0-only
- * Please see LICENSE in the repository root for full details.
- */
-
-package io.element.android.libraries.matrix.impl.timeline.postprocessor
-
-import com.google.common.truth.Truth.assertThat
-import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
-import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
-import io.element.android.libraries.matrix.test.A_UNIQUE_ID
-import io.element.android.libraries.matrix.test.timeline.anEventTimelineItem
-import kotlinx.coroutines.test.StandardTestDispatcher
-import kotlinx.coroutines.test.TestScope
-import kotlinx.coroutines.test.runTest
-import org.junit.Test
-import java.util.Date
-
-class TimelineEncryptedHistoryPostProcessorTest {
-    private val defaultLastLoginTimestamp = Date(1_689_061_264L)
-
-    @Test
-    fun `given an unencrypted room, nothing is done`() = runTest {
-        val processor = createPostProcessor(isRoomEncrypted = false)
-        val items = listOf(
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem())
-        )
-        assertThat(processor.process(items)).isSameInstanceAs(items)
-    }
-
-    @Test
-    fun `given an encrypted room, and key backup enabled, nothing is done`() = runTest {
-        val processor = createPostProcessor(isKeyBackupEnabled = true)
-        val items = listOf(
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem())
-        )
-        assertThat(processor.process(items)).isSameInstanceAs(items)
-    }
-
-    @Test
-    fun `given a null lastLoginTimestamp, nothing is done`() = runTest {
-        val processor = createPostProcessor(lastLoginTimestamp = null)
-        val items = listOf(
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem())
-        )
-        assertThat(processor.process(items)).isSameInstanceAs(items)
-    }
-
-    @Test
-    fun `given an empty list, nothing is done`() = runTest {
-        val processor = createPostProcessor()
-        val items = emptyList<MatrixTimelineItem>()
-        assertThat(processor.process(items)).isSameInstanceAs(items)
-    }
-
-    @Test
-    fun `given a list with no items before lastLoginTimestamp, nothing is done`() = runTest {
-        val processor = createPostProcessor()
-        val items = listOf(
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem(timestamp = defaultLastLoginTimestamp.time + 1))
-        )
-        assertThat(processor.process(items)).isSameInstanceAs(items)
-    }
-
-    @Test
-    fun `given a list with an item with equal timestamp as lastLoginTimestamp, it's replaced`() = runTest {
-        val processor = createPostProcessor()
-        val items = listOf(
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem(timestamp = defaultLastLoginTimestamp.time))
-        )
-        assertThat(processor.process(items))
-            .isEqualTo(listOf(MatrixTimelineItem.Virtual(encryptedHistoryBannerId, VirtualTimelineItem.EncryptedHistoryBanner)))
-    }
-
-    @Test
-    fun `given a list with an item with a lower timestamp than lastLoginTimestamp, it's replaced`() = runTest {
-        val processor = createPostProcessor()
-        val items = listOf(
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem(timestamp = defaultLastLoginTimestamp.time - 1))
-        )
-        assertThat(processor.process(items)).isEqualTo(
-            listOf(MatrixTimelineItem.Virtual(encryptedHistoryBannerId, VirtualTimelineItem.EncryptedHistoryBanner))
-        )
-    }
-
-    @Test
-    fun `given a list with several with lower or equal timestamps than lastLoginTimestamp, then they're replaced`() = runTest {
-        val processor = createPostProcessor()
-        val items = listOf(
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem(timestamp = defaultLastLoginTimestamp.time - 1)),
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem(timestamp = defaultLastLoginTimestamp.time)),
-            MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem(timestamp = defaultLastLoginTimestamp.time + 1)),
-        )
-        assertThat(processor.process(items)).isEqualTo(
-            listOf(
-                MatrixTimelineItem.Virtual(encryptedHistoryBannerId, VirtualTimelineItem.EncryptedHistoryBanner),
-                MatrixTimelineItem.Event(A_UNIQUE_ID, anEventTimelineItem(timestamp = defaultLastLoginTimestamp.time + 1))
-            )
-        )
-    }
-
-    private fun TestScope.createPostProcessor(
-        lastLoginTimestamp: Date? = defaultLastLoginTimestamp,
-        isRoomEncrypted: Boolean = true,
-        isKeyBackupEnabled: Boolean = false,
-    ) = TimelineEncryptedHistoryPostProcessor(
-        lastLoginTimestamp = lastLoginTimestamp,
-        isRoomEncrypted = isRoomEncrypted,
-        isKeyBackupEnabled = isKeyBackupEnabled,
-        dispatcher = StandardTestDispatcher(testScheduler)
-    )
-}