Merge remote-tracking branch 'upstream/develop' into develop

daedric7 · Jan 22, 2025 · b56cf00 · b56cf00
2 parents e1178fd + e4768a8
commit b56cf00
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 38 deletions.
diff --git a/...lin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt b/...lin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerPresenter.kt
@@ -18,7 +18,6 @@ import io.element.android.features.knockrequests.impl.data.KnockRequestPresentab
 import io.element.android.features.knockrequests.impl.data.KnockRequestsService
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.core.coroutine.mapState
-import io.element.android.libraries.core.extensions.firstIfSingle
 import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
@@ -79,7 +78,7 @@ class KnockRequestsBannerPresenter @Inject constructor(
         knockRequests: List<KnockRequestPresentable>,
         displayAcceptError: MutableState<Boolean>,
     ) = launch {
-        val knockRequest = knockRequests.firstIfSingle()
+        val knockRequest = knockRequests.singleOrNull()
         if (knockRequest != null) {
             knockRequestsService.acceptKnockRequest(knockRequest, optimistic = true)
                 .onFailure {

diff --git a/.../kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt b/.../kotlin/io/element/android/features/knockrequests/impl/banner/KnockRequestsBannerState.kt
@@ -12,7 +12,6 @@ import androidx.compose.ui.res.pluralStringResource
 import androidx.compose.ui.res.stringResource
 import io.element.android.features.knockrequests.impl.R
 import io.element.android.features.knockrequests.impl.data.KnockRequestPresentable
-import io.element.android.libraries.core.extensions.firstIfSingle
 import kotlinx.collections.immutable.ImmutableList
 
 data class KnockRequestsBannerState(
@@ -22,8 +21,8 @@ data class KnockRequestsBannerState(
     val canAccept: Boolean,
     val eventSink: (KnockRequestsBannerEvents) -> Unit,
 ) {
-    val subtitle = knockRequests.firstIfSingle()?.userId?.value
-    val reason = knockRequests.firstIfSingle()?.reason
+    val subtitle = knockRequests.singleOrNull()?.userId?.value
+    val reason = knockRequests.singleOrNull()?.reason
 
     @Composable
     fun formattedTitle(): String {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -173,7 +173,7 @@ jsoup = "org.jsoup:jsoup:1.18.3"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.75"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.76"
 matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
 matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
 sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/List.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/List.kt
diff --git a/...trix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/...trix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -76,13 +76,16 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.withContext
+import org.matrix.rustcomponents.sdk.AllowedMessageTypes
 import org.matrix.rustcomponents.sdk.DateDividerMode
 import org.matrix.rustcomponents.sdk.IdentityStatusChangeListener
 import org.matrix.rustcomponents.sdk.KnockRequestsListener
 import org.matrix.rustcomponents.sdk.RoomInfo
 import org.matrix.rustcomponents.sdk.RoomInfoListener
 import org.matrix.rustcomponents.sdk.RoomListItem
 import org.matrix.rustcomponents.sdk.RoomMessageEventMessageType
+import org.matrix.rustcomponents.sdk.TimelineConfiguration
+import org.matrix.rustcomponents.sdk.TimelineFocus
 import org.matrix.rustcomponents.sdk.TypingNotificationsListener
 import org.matrix.rustcomponents.sdk.UserPowerLevelUpdate
 import org.matrix.rustcomponents.sdk.WidgetCapabilities
@@ -206,10 +209,16 @@ class RustMatrixRoom(
 
     override suspend fun timelineFocusedOnEvent(eventId: EventId): Result<Timeline> = withContext(roomDispatcher) {
         runCatching {
-            innerRoom.timelineFocusedOnEvent(
-                eventId = eventId.value,
-                numContextEvents = 50u,
-                internalIdPrefix = "focus_$eventId",
+            innerRoom.timelineWithConfiguration(
+                configuration = TimelineConfiguration(
+                    focus = TimelineFocus.Event(
+                        eventId = eventId.value,
+                        numContextEvents = 50u,
+                    ),
+                    allowedMessageTypes = AllowedMessageTypes.All,
+                    internalIdPrefix = "focus_$eventId",
+                    dateDividerMode = DateDividerMode.DAILY,
+                )
             ).let { inner ->
                 createTimeline(inner, mode = Timeline.Mode.FOCUSED_ON_EVENT)
             }
@@ -224,10 +233,16 @@ class RustMatrixRoom(
 
     override suspend fun pinnedEventsTimeline(): Result<Timeline> = withContext(roomDispatcher) {
         runCatching {
-            innerRoom.pinnedEventsTimeline(
-                internalIdPrefix = "pinned_events",
-                maxEventsToLoad = 100u,
-                maxConcurrentRequests = 10u,
+            innerRoom.timelineWithConfiguration(
+                configuration = TimelineConfiguration(
+                    focus = TimelineFocus.PinnedEvents(
+                        maxEventsToLoad = 100u,
+                        maxConcurrentRequests = 10u,
+                    ),
+                    allowedMessageTypes = AllowedMessageTypes.All,
+                    internalIdPrefix = "pinned_events",
+                    dateDividerMode = DateDividerMode.DAILY,
+                )
             ).let { inner ->
                 createTimeline(inner, mode = Timeline.Mode.PINNED_EVENTS)
             }
@@ -240,15 +255,20 @@ class RustMatrixRoom(
 
     override suspend fun mediaTimeline(): Result<Timeline> = withContext(roomDispatcher) {
         runCatching {
-            innerRoom.messageFilteredTimeline(
-                internalIdPrefix = "MediaGallery_",
-                allowedMessageTypes = listOf(
-                    RoomMessageEventMessageType.FILE,
-                    RoomMessageEventMessageType.IMAGE,
-                    RoomMessageEventMessageType.VIDEO,
-                    RoomMessageEventMessageType.AUDIO,
-                ),
-                dateDividerMode = DateDividerMode.MONTHLY,
+            innerRoom.timelineWithConfiguration(
+                configuration = TimelineConfiguration(
+                    focus = TimelineFocus.Live,
+                    allowedMessageTypes = AllowedMessageTypes.Only(
+                        types = listOf(
+                            RoomMessageEventMessageType.FILE,
+                            RoomMessageEventMessageType.IMAGE,
+                            RoomMessageEventMessageType.VIDEO,
+                            RoomMessageEventMessageType.AUDIO,
+                        )
+                    ),
+                    internalIdPrefix = "MediaGallery_",
+                    dateDividerMode = DateDividerMode.MONTHLY,
+                )
             ).let { inner ->
                 createTimeline(inner, mode = Timeline.Mode.MEDIA)
             }