Merge pull request #836 from vector-im/feature/fga/update-rust-sdk-0.1.29-again

ganfra · web-flow · commit d34a7804c0fc · 2023-07-10T16:08:35.000+02:00
Update rust sdk to 0.1.29 (new back pagination status api)
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt
@@ -23,7 +23,6 @@ import io.element.android.features.messages.impl.timeline.model.TimelineItemReac
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemStateEventContent
 import io.element.android.features.messages.impl.timeline.model.event.aTimelineItemTextContent
-import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemLoadingModel
 import io.element.android.features.messages.impl.timeline.model.virtual.aTimelineItemDaySeparatorModel
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@@ -93,15 +92,9 @@ internal fun aTimelineItemList(content: TimelineItemEventContent): ImmutableList
         aGroupedEvents(),
         // A day separator
         aTimelineItemDaySeparator(),
-        // Loading
-        aTimelineItemLoading(),
     )
 }
 
-fun aTimelineItemLoading(): TimelineItem.Virtual {
-    return TimelineItem.Virtual("virtual_loading", TimelineItemLoadingModel)
-}
-
 fun aTimelineItemDaySeparator(): TimelineItem.Virtual {
     return TimelineItem.Virtual("virtual_day", aTimelineItemDaySeparatorModel("Today"))
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineView.kt
@@ -32,7 +32,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
@@ -59,6 +59,7 @@ import io.element.android.features.messages.impl.timeline.components.TimelineIte
 import io.element.android.features.messages.impl.timeline.components.TimelineItemStateEventRow
 import io.element.android.features.messages.impl.timeline.components.TimelineItemVirtualRow
 import io.element.android.features.messages.impl.timeline.components.group.GroupHeaderView
+import io.element.android.features.messages.impl.timeline.components.virtual.TimelineLoadingMoreIndicator
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContent
 import io.element.android.features.messages.impl.timeline.model.event.TimelineItemEventContentProvider
@@ -114,11 +115,11 @@ fun TimelineView(
             reverseLayout = true,
             contentPadding = PaddingValues(vertical = 8.dp),
         ) {
-            itemsIndexed(
+            items(
                 items = state.timelineItems,
-                contentType = { _, timelineItem -> timelineItem.contentType() },
-                key = { _, timelineItem -> timelineItem.identifier() },
-            ) { index, timelineItem ->
+                contentType = { timelineItem -> timelineItem.contentType() },
+                key = { timelineItem -> timelineItem.identifier() },
+            ) { timelineItem ->
                 TimelineItemRow(
                     timelineItem = timelineItem,
                     highlightedItem = state.highlightedEventId?.value,
@@ -132,8 +133,14 @@ fun TimelineView(
                     onTimestampClicked = onTimestampClicked,
                     onSwipeToReply = onSwipeToReply,
                 )
-                if (index == state.timelineItems.lastIndex) {
-                    onReachedLoadMore()
+            }
+            if (state.paginationState.canBackPaginate) {
+                // Do not use key parameter to avoid wrong positioning
+                item(contentType = "TimelineLoadingMoreIndicator") {
+                    TimelineLoadingMoreIndicator()
+                    LaunchedEffect(Unit) {
+                        onReachedLoadMore()
+                    }
                 }
             }
         }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemVirtualRow.kt
@@ -22,16 +22,15 @@ import io.element.android.features.messages.impl.timeline.components.virtual.Tim
 import io.element.android.features.messages.impl.timeline.components.virtual.TimelineLoadingMoreIndicator
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
 import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemDaySeparatorModel
-import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemLoadingModel
+import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemReadMarkerModel
 
 @Composable
 fun TimelineItemVirtualRow(
     virtual: TimelineItem.Virtual,
     modifier: Modifier = Modifier
 ) {
     when (virtual.model) {
-        is TimelineItemLoadingModel -> TimelineLoadingMoreIndicator(modifier)
         is TimelineItemDaySeparatorModel -> TimelineItemDaySeparatorView(virtual.model, modifier)
-        else -> return
+        TimelineItemReadMarkerModel -> return
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/TimelineItemsFactory.kt
@@ -106,7 +106,7 @@ class TimelineItemsFactory @Inject constructor(
         val timelineItemState =
             when (val currentTimelineItem = timelineItems[index]) {
                 is MatrixTimelineItem.Event -> eventItemFactory.create(currentTimelineItem, index, timelineItems)
-                is MatrixTimelineItem.Virtual -> virtualItemFactory.create(currentTimelineItem, index, timelineItems)
+                is MatrixTimelineItem.Virtual -> virtualItemFactory.create(currentTimelineItem, index)
                 MatrixTimelineItem.Other -> null
             }
         timelineItemsCache[index] = timelineItemState
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemVirtualFactory.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/virtual/TimelineItemVirtualFactory.kt
@@ -17,9 +17,7 @@
 package io.element.android.features.messages.impl.timeline.factories.virtual
 
 import io.element.android.features.messages.impl.timeline.model.TimelineItem
-import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemLoadingModel
 import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemReadMarkerModel
-import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemUnknownVirtualModel
 import io.element.android.features.messages.impl.timeline.model.virtual.TimelineItemVirtualModel
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
 import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
@@ -30,23 +28,19 @@ class TimelineItemVirtualFactory @Inject constructor(
 ) {
 
     fun create(
-        currentTimelineItem: MatrixTimelineItem.Virtual,
+        virtualTimelineItem: MatrixTimelineItem.Virtual,
         index: Int,
-        timelineItems: List<MatrixTimelineItem>,
     ): TimelineItem.Virtual {
         return TimelineItem.Virtual(
             id = "virtual_item_$index",
-            model = currentTimelineItem.computeModel(index)
+            model = virtualTimelineItem.computeModel()
         )
     }
 
-    private fun MatrixTimelineItem.Virtual.computeModel(index: Int): TimelineItemVirtualModel {
+    private fun MatrixTimelineItem.Virtual.computeModel(): TimelineItemVirtualModel {
         return when (val inner = virtual) {
             is VirtualTimelineItem.DayDivider -> daySeparatorFactory.create(inner)
             is VirtualTimelineItem.ReadMarker -> TimelineItemReadMarkerModel
-            is VirtualTimelineItem.LoadingIndicator -> TimelineItemLoadingModel
-            is VirtualTimelineItem.TimelineStart -> TimelineItemReadMarkerModel
-            else -> TimelineItemUnknownVirtualModel
         }
     }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLoadingModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemLoadingModel.kt
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemTimelineStartModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemTimelineStartModel.kt
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemUnknownVirtualModel.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/virtual/TimelineItemUnknownVirtualModel.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -145,7 +145,7 @@ jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.28"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.29"
 sqldelight-driver-android = { module = "com.squareup.sqldelight:android-driver", version.ref = "sqldelight" }
 sqldelight-driver-jvm = { module = "com.squareup.sqldelight:sqlite-driver", version.ref = "sqldelight" }
 sqldelight-coroutines = { module = "com.squareup.sqldelight:coroutines-extensions", version.ref = "sqldelight" }
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/virtual/VirtualTimelineItem.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/virtual/VirtualTimelineItem.kt
@@ -24,7 +24,4 @@ sealed interface VirtualTimelineItem {
 
     object ReadMarker : VirtualTimelineItem
 
-    object LoadingIndicator : VirtualTimelineItem
-
-    object TimelineStart : VirtualTimelineItem
 }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -39,6 +39,7 @@ import io.element.android.libraries.matrix.impl.core.toProgressWatcher
 import io.element.android.libraries.matrix.impl.room.location.toInner
 import io.element.android.libraries.matrix.impl.media.map
 import io.element.android.libraries.matrix.impl.timeline.RustMatrixTimeline
+import io.element.android.libraries.matrix.impl.timeline.backPaginationStatusFlow
 import io.element.android.libraries.matrix.impl.timeline.timelineDiffFlow
 import io.element.android.services.toolbox.api.systemclock.SystemClock
 import kotlinx.coroutines.CoroutineScope
@@ -111,6 +112,12 @@ class RustMatrixRoom(
                 _syncUpdateFlow.value = systemClock.epochMillis()
                 _timeline.postDiff(it)
             }.launchIn(this)
+
+            innerRoom.backPaginationStatusFlow()
+                .onEach {
+                    _timeline.postPaginationStatus(it)
+                }.launchIn(this)
+
             fetchMembers()
         }
         isInit.value = true
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/MatrixTimelineDiffProcessor.kt
@@ -16,9 +16,7 @@
 
 package io.element.android.libraries.matrix.impl.timeline
 
-import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
 import io.element.android.libraries.matrix.api.timeline.MatrixTimelineItem
-import io.element.android.libraries.matrix.api.timeline.item.virtual.VirtualTimelineItem
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.sync.Mutex
@@ -28,7 +26,6 @@ import org.matrix.rustcomponents.sdk.TimelineDiff
 import org.matrix.rustcomponents.sdk.TimelineItem
 
 internal class MatrixTimelineDiffProcessor(
-    private val paginationState: MutableStateFlow<MatrixTimeline.PaginationState>,
     private val timelineItems: MutableStateFlow<List<MatrixTimelineItem>>,
     private val timelineItemFactory: MatrixTimelineItemMapper,
 ) {
@@ -40,7 +37,6 @@ internal class MatrixTimelineDiffProcessor(
         updateTimelineItems {
             val mappedItems = items.map { it.asMatrixTimelineItem() }
             addAll(mappedItems)
-            updateBackPaginationState()
         }
         initLatch.complete(Unit)
     }
@@ -50,29 +46,9 @@ internal class MatrixTimelineDiffProcessor(
         initLatch.await()
         updateTimelineItems {
             applyDiff(diff)
-            updateBackPaginationState()
         }
     }
 
-    private fun updateBackPaginationState(virtualItem: VirtualTimelineItem?) {
-        val currentPaginationState = paginationState.value
-        val newPaginationState = when (virtualItem) {
-            VirtualTimelineItem.LoadingIndicator -> currentPaginationState.copy(
-                isBackPaginating = true,
-                canBackPaginate = true
-            )
-            VirtualTimelineItem.TimelineStart -> currentPaginationState.copy(
-                isBackPaginating = false,
-                canBackPaginate = false
-            )
-            else -> currentPaginationState.copy(
-                isBackPaginating = false,
-                canBackPaginate = true
-            )
-        }
-        paginationState.value = newPaginationState
-    }
-
     private suspend fun updateTimelineItems(block: MutableList<MatrixTimelineItem>.() -> Unit) =
         mutex.withLock {
             val mutableTimelineItems = timelineItems.value.toMutableList()
@@ -125,13 +101,6 @@ internal class MatrixTimelineDiffProcessor(
         }
     }
 
-    private fun List<MatrixTimelineItem>.updateBackPaginationState() {
-        when (val firstItem = firstOrNull()) {
-            is MatrixTimelineItem.Virtual -> updateBackPaginationState(firstItem.virtual)
-            else -> updateBackPaginationState(null)
-        }
-    }
-
     private fun TimelineItem.asMatrixTimelineItem(): MatrixTimelineItem {
         return timelineItemFactory.map(this)
     }
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RoomTimelineExtensions.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RoomTimelineExtensions.kt
@@ -21,6 +21,8 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.buffer
+import org.matrix.rustcomponents.sdk.BackPaginationStatus
+import org.matrix.rustcomponents.sdk.BackPaginationStatusListener
 import org.matrix.rustcomponents.sdk.Room
 import org.matrix.rustcomponents.sdk.TimelineDiff
 import org.matrix.rustcomponents.sdk.TimelineItem
@@ -37,3 +39,13 @@ internal fun Room.timelineDiffFlow(onInitialList: suspend (List<TimelineItem>) -
         onInitialList(result.items)
         result.itemsStream
     }.buffer(Channel.UNLIMITED)
+
+internal fun Room.backPaginationStatusFlow(): Flow<BackPaginationStatus> =
+    mxCallbackFlow {
+        val listener = object : BackPaginationStatusListener {
+            override fun onUpdate(status: BackPaginationStatus) {
+                trySendBlocking(status)
+            }
+        }
+        subscribeToBackPaginationStatus(listener)
+    }.buffer(Channel.UNLIMITED)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustMatrixTimeline.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/RustMatrixTimeline.kt
@@ -31,8 +31,10 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.getAndUpdate
 import kotlinx.coroutines.flow.sample
 import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.BackPaginationStatus
 import org.matrix.rustcomponents.sdk.PaginationOptions
 import org.matrix.rustcomponents.sdk.Room
 import org.matrix.rustcomponents.sdk.TimelineDiff
@@ -65,7 +67,6 @@ class RustMatrixTimeline(
     )
 
     private val timelineDiffProcessor = MatrixTimelineDiffProcessor(
-        paginationState = _paginationState,
         timelineItems = _timelineItems,
         timelineItemFactory = timelineItemFactory,
     )
@@ -83,6 +84,31 @@ class RustMatrixTimeline(
         timelineDiffProcessor.postDiff(timelineDiff)
     }
 
+    internal fun postPaginationStatus(status: BackPaginationStatus) {
+        _paginationState.getAndUpdate { currentPaginationState ->
+            when (status) {
+                BackPaginationStatus.IDLE -> {
+                    currentPaginationState.copy(
+                        isBackPaginating = false,
+                        canBackPaginate = true
+                    )
+                }
+                BackPaginationStatus.PAGINATING -> {
+                    currentPaginationState.copy(
+                        isBackPaginating = true,
+                        canBackPaginate = true
+                    )
+                }
+                BackPaginationStatus.TIMELINE_START_REACHED -> {
+                    currentPaginationState.copy(
+                        isBackPaginating = false,
+                        canBackPaginate = false
+                    )
+                }
+            }
+        }
+    }
+
     override suspend fun fetchDetailsForEvent(eventId: EventId): Result<Unit> = withContext(coroutineDispatchers.io) {
         runCatching {
             innerRoom.fetchDetailsForEvent(eventId.value)
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/virtual/VirtualTimelineItemMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/virtual/VirtualTimelineItemMapper.kt
@@ -24,9 +24,7 @@ class VirtualTimelineItemMapper {
     fun map(virtualTimelineItem: RustVirtualTimelineItem): VirtualTimelineItem {
         return when (virtualTimelineItem) {
             is RustVirtualTimelineItem.DayDivider -> VirtualTimelineItem.DayDivider(virtualTimelineItem.ts.toLong())
-            RustVirtualTimelineItem.LoadingIndicator -> VirtualTimelineItem.LoadingIndicator
             RustVirtualTimelineItem.ReadMarker -> VirtualTimelineItem.ReadMarker
-            RustVirtualTimelineItem.TimelineStart -> VirtualTimelineItem.TimelineStart
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class TimelineItemsFactory @Inject constructor(`
`106`	`106`	`val timelineItemState =`
`107`	`107`	`when (val currentTimelineItem = timelineItems[index]) {`
`108`	`108`	`is MatrixTimelineItem.Event -> eventItemFactory.create(currentTimelineItem, index, timelineItems)`
`109`		`- is MatrixTimelineItem.Virtual -> virtualItemFactory.create(currentTimelineItem, index, timelineItems)`
	`109`	`+ is MatrixTimelineItem.Virtual -> virtualItemFactory.create(currentTimelineItem, index)`
`110`	`110`	`MatrixTimelineItem.Other -> null`
`111`	`111`	`}`
`112`	`112`	`timelineItemsCache[index] = timelineItemState`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,4 @@ sealed interface VirtualTimelineItem {`
`24`	`24`
`25`	`25`	`object ReadMarker : VirtualTimelineItem`
`26`	`26`
`27`		`- object LoadingIndicator : VirtualTimelineItem`
`28`		`-`
`29`		`- object TimelineStart : VirtualTimelineItem`
`30`	`27`	`}`