Skip to content

Commit 1b6f658

Browse files
committed
deps(rust sdk) : update to 25.03.05 and fix the breaking changes
1 parent dc95331 commit 1b6f658

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ jsoup = "org.jsoup:jsoup:1.19.1"
174174
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
175175
molecule-runtime = "app.cash.molecule:molecule-runtime:2.0.0"
176176
timber = "com.jakewharton.timber:timber:5.0.1"
177-
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.2.26"
177+
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.3.5"
178178
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
179179
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
180180
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ import kotlinx.coroutines.flow.map
8383
import kotlinx.coroutines.flow.onEach
8484
import kotlinx.coroutines.flow.onStart
8585
import kotlinx.coroutines.withContext
86-
import org.matrix.rustcomponents.sdk.AllowedMessageTypes
8786
import org.matrix.rustcomponents.sdk.DateDividerMode
8887
import org.matrix.rustcomponents.sdk.IdentityStatusChangeListener
8988
import org.matrix.rustcomponents.sdk.KnockRequestsListener
@@ -92,6 +91,7 @@ import org.matrix.rustcomponents.sdk.RoomInfoListener
9291
import org.matrix.rustcomponents.sdk.RoomListItem
9392
import org.matrix.rustcomponents.sdk.RoomMessageEventMessageType
9493
import org.matrix.rustcomponents.sdk.TimelineConfiguration
94+
import org.matrix.rustcomponents.sdk.TimelineFilter
9595
import org.matrix.rustcomponents.sdk.TimelineFocus
9696
import org.matrix.rustcomponents.sdk.TypingNotificationsListener
9797
import org.matrix.rustcomponents.sdk.UserPowerLevelUpdate
@@ -234,9 +234,9 @@ class RustMatrixRoom(
234234
)
235235
}
236236

237-
val allowedMessageTypes = when (createTimelineParams) {
237+
val filter = when (createTimelineParams) {
238238
is CreateTimelineParams.MediaOnly,
239-
is CreateTimelineParams.MediaOnlyFocused -> AllowedMessageTypes.Only(
239+
is CreateTimelineParams.MediaOnlyFocused -> TimelineFilter.OnlyMessage(
240240
types = listOf(
241241
RoomMessageEventMessageType.FILE,
242242
RoomMessageEventMessageType.IMAGE,
@@ -245,7 +245,7 @@ class RustMatrixRoom(
245245
)
246246
)
247247
is CreateTimelineParams.Focused,
248-
CreateTimelineParams.PinnedOnly -> AllowedMessageTypes.All
248+
CreateTimelineParams.PinnedOnly -> TimelineFilter.All
249249
}
250250

251251
val internalIdPrefix = when (createTimelineParams) {
@@ -268,9 +268,10 @@ class RustMatrixRoom(
268268
innerRoom.timelineWithConfiguration(
269269
configuration = TimelineConfiguration(
270270
focus = focus,
271-
allowedMessageTypes = allowedMessageTypes,
271+
filter = filter,
272272
internalIdPrefix = internalIdPrefix,
273273
dateDividerMode = dateDividerMode,
274+
trackReadReceipts = false,
274275
)
275276
).let { inner ->
276277
val mode = when (createTimelineParams) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import org.matrix.rustcomponents.sdk.TimelineDiff
2020
import org.matrix.rustcomponents.sdk.TimelineInterface
2121
import org.matrix.rustcomponents.sdk.TimelineListener
2222
import timber.log.Timber
23-
import uniffi.matrix_sdk_ui.LiveBackPaginationStatus
23+
import uniffi.matrix_sdk.RoomPaginationStatus
2424

25-
internal fun TimelineInterface.liveBackPaginationStatus(): Flow<LiveBackPaginationStatus> = callbackFlow {
25+
internal fun TimelineInterface.liveBackPaginationStatus(): Flow<RoomPaginationStatus> = callbackFlow {
2626
val listener = object : PaginationStatusListener {
27-
override fun onUpdate(status: LiveBackPaginationStatus) {
27+
override fun onUpdate(status: RoomPaginationStatus) {
2828
trySend(status)
2929
}
3030
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ import org.matrix.rustcomponents.sdk.SendAttachmentJoinHandle
7373
import org.matrix.rustcomponents.sdk.UploadParameters
7474
import org.matrix.rustcomponents.sdk.use
7575
import timber.log.Timber
76-
import uniffi.matrix_sdk_ui.LiveBackPaginationStatus
76+
import uniffi.matrix_sdk.RoomPaginationStatus
7777
import java.io.File
7878
import org.matrix.rustcomponents.sdk.EventOrTransactionId as RustEventOrTransactionId
7979
import org.matrix.rustcomponents.sdk.Timeline as InnerTimeline
@@ -148,8 +148,8 @@ class RustTimeline(
148148
.onEach { backPaginationStatus ->
149149
updatePaginationStatus(Timeline.PaginationDirection.BACKWARDS) {
150150
when (backPaginationStatus) {
151-
is LiveBackPaginationStatus.Idle -> it.copy(isPaginating = false, hasMoreToLoad = !backPaginationStatus.hitStartOfTimeline)
152-
is LiveBackPaginationStatus.Paginating -> it.copy(isPaginating = true, hasMoreToLoad = true)
151+
is RoomPaginationStatus.Idle -> it.copy(isPaginating = false, hasMoreToLoad = !backPaginationStatus.hitTimelineStart)
152+
is RoomPaginationStatus.Paginating -> it.copy(isPaginating = true, hasMoreToLoad = true)
153153
}
154154
}
155155
}

0 commit comments

Comments
 (0)