Skip to content

Commit e7e2f38

Browse files
Update dependency org.matrix.rustcomponents:sdk-android to v25.11.11 (#5716)
* Update dependency org.matrix.rustcomponents:sdk-android to v25.11.11 * Fix API breaks: - `Client.loginWithQrCode` is now `Client.newLoginWithQrCodeHandler`. - Rust's `OtherState` can now have `RoomCreate` and `RoomHistoryVisibility` values. - Fix fixtures --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín <[email protected]>
1 parent 6416c79 commit e7e2f38

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
177177
# https://github.com/matrix-org/matrix-rust-components-kotlin/commits/main/sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt
178178
# All new features should not be implemented in the pull request that upgrades the version, developers should
179179
# only fix API breaks and may add some TODOs.
180-
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.4"
180+
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.11.11"
181181

182182
# Others
183183
coil = { module = "io.coil-kt.coil3:coil", version.ref = "coil" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ class RustMatrixAuthenticationService(
282282
sessionPaths = emptySessionPaths,
283283
qrCodeData = sdkQrCodeLoginData,
284284
)
285-
client.loginWithQrCode(
285+
client.newLoginWithQrCodeHandler(
286286
oidcConfiguration = oidcConfiguration,
287287
).use {
288288
it.scan(

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/timeline/item/event/TimelineEventContentMapper.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@ private fun RustOtherState.map(): OtherState {
220220
is RustOtherState.RoomTopic -> OtherState.RoomTopic(topic)
221221
RustOtherState.SpaceChild -> OtherState.SpaceChild
222222
RustOtherState.SpaceParent -> OtherState.SpaceParent
223+
is RustOtherState.RoomCreate -> OtherState.RoomCreate
224+
is RustOtherState.RoomHistoryVisibility -> OtherState.RoomHistoryVisibility
223225
}
224226
}
225227

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/NotificationItem.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import io.element.android.libraries.matrix.api.core.ThreadId
1212
import io.element.android.libraries.matrix.impl.fixtures.fakes.FakeFfiTimelineEvent
1313
import io.element.android.libraries.matrix.test.A_ROOM_NAME
1414
import io.element.android.libraries.matrix.test.A_USER_NAME
15+
import org.matrix.rustcomponents.sdk.Action
1516
import org.matrix.rustcomponents.sdk.JoinRule
1617
import org.matrix.rustcomponents.sdk.NotificationEvent
1718
import org.matrix.rustcomponents.sdk.NotificationItem
@@ -27,13 +28,15 @@ fun aRustNotificationItem(
2728
isNoisy: Boolean? = false,
2829
hasMention: Boolean? = false,
2930
threadId: ThreadId? = null,
31+
actions: List<Action>? = null,
3032
) = NotificationItem(
3133
event = event,
3234
senderInfo = senderInfo,
3335
roomInfo = roomInfo,
3436
isNoisy = isNoisy,
3537
hasMention = hasMention,
3638
threadId = threadId?.value,
39+
actions = actions,
3740
)
3841

3942
fun aRustBatchNotificationResult(

0 commit comments

Comments
 (0)