Skip to content

Commit 9e7ae34

Browse files
ganfraganfra
authored
Merge pull request #7107 from element-hq/renovate/org.matrix.rustcomponents-sdk-android-26.x
Update dependency org.matrix.rustcomponents:sdk-android to v26.06.25
2 parents 5848e0b + 16d16b9 commit 9e7ae34

6 files changed

Lines changed: 28 additions & 15 deletions

File tree

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ test_detekt_test = { module = "io.gitlab.arturbosch.detekt:detekt-test", version
184184
# 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
185185
# All new features should not be implemented in the pull request that upgrades the version, developers should
186186
# only fix API breaks and may add some TODOs.
187-
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.06.24"
187+
matrix_sdk = "org.matrix.rustcomponents:sdk-android:26.06.25"
188188

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

‎libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ sealed interface StateEventType {
3434
data object MemberHints : StateEventType
3535
data object RoomImagePack : StateEventType
3636
data object RoomLanguage : StateEventType
37+
data object RoomPolicy : StateEventType
3738

3839
data class Custom(val type: String) : StateEventType
3940
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
package io.element.android.libraries.matrix.impl.room
1010

1111
import io.element.android.libraries.matrix.api.room.MessageEventType
12-
import org.matrix.rustcomponents.sdk.MessageLikeEventType
12+
import uniffi.ruma_events.MessageLikeEventType
13+
import uniffi.ruma_events.messageLikeEventTypeFromString
1314

1415
fun MessageEventType.map(): MessageLikeEventType = when (this) {
1516
MessageEventType.Audio -> MessageLikeEventType.Audio
@@ -51,7 +52,7 @@ fun MessageEventType.map(): MessageLikeEventType = when (this) {
5152
MessageEventType.UnstablePollStart -> MessageLikeEventType.UnstablePollStart
5253
MessageEventType.Video -> MessageLikeEventType.Video
5354
MessageEventType.Voice -> MessageLikeEventType.Voice
54-
is MessageEventType.Other -> MessageLikeEventType.Other(type)
55+
is MessageEventType.Other -> messageLikeEventTypeFromString(type)
5556
}
5657

5758
fun MessageLikeEventType.map(): MessageEventType = when (this) {
@@ -94,5 +95,5 @@ fun MessageLikeEventType.map(): MessageEventType = when (this) {
9495
MessageLikeEventType.RtcDecline -> MessageEventType.RtcDecline
9596
MessageLikeEventType.Video -> MessageEventType.Video
9697
MessageLikeEventType.Voice -> MessageEventType.Voice
97-
is MessageLikeEventType.Other -> MessageEventType.Other(v1)
98+
is MessageLikeEventType.Custom -> MessageEventType.Other(type = toString())
9899
}

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
package io.element.android.libraries.matrix.impl.room
1010

1111
import io.element.android.libraries.matrix.api.room.StateEventType
12-
import org.matrix.rustcomponents.sdk.StateEventType as RustStateEventType
12+
import uniffi.ruma_events.stateEventTypeFromString
13+
import uniffi.ruma_events.StateEventType as RustStateEventType
1314

1415
fun StateEventType.map(): RustStateEventType = when (this) {
1516
StateEventType.PolicyRuleRoom -> RustStateEventType.PolicyRuleRoom
@@ -23,7 +24,7 @@ fun StateEventType.map(): RustStateEventType = when (this) {
2324
StateEventType.RoomGuestAccess -> RustStateEventType.RoomGuestAccess
2425
StateEventType.RoomHistoryVisibility -> RustStateEventType.RoomHistoryVisibility
2526
StateEventType.RoomJoinRules -> RustStateEventType.RoomJoinRules
26-
StateEventType.RoomMemberEvent -> RustStateEventType.RoomMemberEvent
27+
StateEventType.RoomMemberEvent -> RustStateEventType.RoomMember
2728
StateEventType.RoomName -> RustStateEventType.RoomName
2829
StateEventType.RoomPinnedEvents -> RustStateEventType.RoomPinnedEvents
2930
StateEventType.RoomPowerLevels -> RustStateEventType.RoomPowerLevels
@@ -37,7 +38,8 @@ fun StateEventType.map(): RustStateEventType = when (this) {
3738
StateEventType.MemberHints -> RustStateEventType.MemberHints
3839
StateEventType.RoomImagePack -> RustStateEventType.RoomImagePack
3940
StateEventType.RoomLanguage -> RustStateEventType.RoomLanguage
40-
is StateEventType.Custom -> RustStateEventType.Custom(type)
41+
StateEventType.RoomPolicy -> RustStateEventType.RoomPolicy
42+
is StateEventType.Custom -> stateEventTypeFromString(type)
4143
}
4244

4345
fun RustStateEventType.map(): StateEventType = when (this) {
@@ -52,7 +54,7 @@ fun RustStateEventType.map(): StateEventType = when (this) {
5254
RustStateEventType.RoomGuestAccess -> StateEventType.RoomGuestAccess
5355
RustStateEventType.RoomHistoryVisibility -> StateEventType.RoomHistoryVisibility
5456
RustStateEventType.RoomJoinRules -> StateEventType.RoomJoinRules
55-
RustStateEventType.RoomMemberEvent -> StateEventType.RoomMemberEvent
57+
RustStateEventType.RoomMember -> StateEventType.RoomMemberEvent
5658
RustStateEventType.RoomName -> StateEventType.RoomName
5759
RustStateEventType.RoomPinnedEvents -> StateEventType.RoomPinnedEvents
5860
RustStateEventType.RoomPowerLevels -> StateEventType.RoomPowerLevels
@@ -66,5 +68,6 @@ fun RustStateEventType.map(): StateEventType = when (this) {
6668
RustStateEventType.MemberHints -> StateEventType.MemberHints
6769
RustStateEventType.RoomImagePack -> StateEventType.RoomImagePack
6870
RustStateEventType.RoomLanguage -> StateEventType.RoomLanguage
69-
is RustStateEventType.Custom -> StateEventType.Custom(value)
71+
RustStateEventType.RoomPolicy -> StateEventType.RoomPolicy
72+
is RustStateEventType.Custom -> StateEventType.Custom(this.toString())
7073
}

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/MessageEventTypeKtTest.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ package io.element.android.libraries.matrix.impl.room
1010

1111
import com.google.common.truth.Truth.assertThat
1212
import io.element.android.libraries.matrix.api.room.MessageEventType
13+
import org.junit.Ignore
1314
import org.junit.Test
14-
import org.matrix.rustcomponents.sdk.MessageLikeEventType
15+
import uniffi.ruma_events.MessageLikeEventType
1516

1617
class MessageEventTypeKtTest {
18+
@Ignore("Can't use MessageLikeEventType as that will try accessing the Rust SDK")
1719
@Test
1820
fun `map Rust type should result to correct Kotlin type`() {
1921
assertThat(MessageLikeEventType.CallAnswer.map()).isEqualTo(MessageEventType.CallAnswer)

‎libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/StateEventTypeTest.kt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ package io.element.android.libraries.matrix.impl.room
1010

1111
import com.google.common.truth.Truth.assertThat
1212
import io.element.android.libraries.matrix.api.room.StateEventType
13+
import org.junit.Ignore
1314
import org.junit.Test
14-
import org.matrix.rustcomponents.sdk.StateEventType as RustStateEventType
15+
import uniffi.ruma_events.StateEventType as RustStateEventType
1516

1617
class StateEventTypeTest {
18+
@Ignore("Can't use RustStateEventType as that will try accessing the Rust SDK")
1719
@Test
1820
fun `mapping Rust type should work`() {
1921
assertThat(RustStateEventType.CallMember.map()).isEqualTo(StateEventType.CallMember)
@@ -27,17 +29,19 @@ class StateEventTypeTest {
2729
assertThat(RustStateEventType.RoomGuestAccess.map()).isEqualTo(StateEventType.RoomGuestAccess)
2830
assertThat(RustStateEventType.RoomHistoryVisibility.map()).isEqualTo(StateEventType.RoomHistoryVisibility)
2931
assertThat(RustStateEventType.RoomJoinRules.map()).isEqualTo(StateEventType.RoomJoinRules)
30-
assertThat(RustStateEventType.RoomMemberEvent.map()).isEqualTo(StateEventType.RoomMemberEvent)
32+
assertThat(RustStateEventType.RoomMember.map()).isEqualTo(StateEventType.RoomMemberEvent)
3133
assertThat(RustStateEventType.RoomName.map()).isEqualTo(StateEventType.RoomName)
3234
assertThat(RustStateEventType.RoomPinnedEvents.map()).isEqualTo(StateEventType.RoomPinnedEvents)
35+
assertThat(RustStateEventType.RoomPolicy.map()).isEqualTo(StateEventType.RoomPolicy)
3336
assertThat(RustStateEventType.RoomPowerLevels.map()).isEqualTo(StateEventType.RoomPowerLevels)
3437
assertThat(RustStateEventType.RoomServerAcl.map()).isEqualTo(StateEventType.RoomServerAcl)
3538
assertThat(RustStateEventType.RoomThirdPartyInvite.map()).isEqualTo(StateEventType.RoomThirdPartyInvite)
3639
assertThat(RustStateEventType.RoomTombstone.map()).isEqualTo(StateEventType.RoomTombstone)
3740
assertThat(RustStateEventType.RoomTopic.map()).isEqualTo(StateEventType.RoomTopic)
3841
assertThat(RustStateEventType.SpaceChild.map()).isEqualTo(StateEventType.SpaceChild)
3942
assertThat(RustStateEventType.SpaceParent.map()).isEqualTo(StateEventType.SpaceParent)
40-
assertThat(RustStateEventType.Custom("foo").map()).isEqualTo(StateEventType.Custom("foo"))
43+
// Can't test Custom as it will try calling the Rust code, which is not available in unit tests
44+
// assertThat(stateEventTypeFromString("foo").map()).isEqualTo(StateEventType.Custom("foo"))
4145
}
4246

4347
@Test
@@ -53,16 +57,18 @@ class StateEventTypeTest {
5357
assertThat(StateEventType.RoomGuestAccess.map()).isEqualTo(RustStateEventType.RoomGuestAccess)
5458
assertThat(StateEventType.RoomHistoryVisibility.map()).isEqualTo(RustStateEventType.RoomHistoryVisibility)
5559
assertThat(StateEventType.RoomJoinRules.map()).isEqualTo(RustStateEventType.RoomJoinRules)
56-
assertThat(StateEventType.RoomMemberEvent.map()).isEqualTo(RustStateEventType.RoomMemberEvent)
60+
assertThat(StateEventType.RoomMemberEvent.map()).isEqualTo(RustStateEventType.RoomMember)
5761
assertThat(StateEventType.RoomName.map()).isEqualTo(RustStateEventType.RoomName)
5862
assertThat(StateEventType.RoomPinnedEvents.map()).isEqualTo(RustStateEventType.RoomPinnedEvents)
63+
assertThat(StateEventType.RoomPolicy.map()).isEqualTo(RustStateEventType.RoomPolicy)
5964
assertThat(StateEventType.RoomPowerLevels.map()).isEqualTo(RustStateEventType.RoomPowerLevels)
6065
assertThat(StateEventType.RoomServerAcl.map()).isEqualTo(RustStateEventType.RoomServerAcl)
6166
assertThat(StateEventType.RoomThirdPartyInvite.map()).isEqualTo(RustStateEventType.RoomThirdPartyInvite)
6267
assertThat(StateEventType.RoomTombstone.map()).isEqualTo(RustStateEventType.RoomTombstone)
6368
assertThat(StateEventType.RoomTopic.map()).isEqualTo(RustStateEventType.RoomTopic)
6469
assertThat(StateEventType.SpaceChild.map()).isEqualTo(RustStateEventType.SpaceChild)
6570
assertThat(StateEventType.SpaceParent.map()).isEqualTo(RustStateEventType.SpaceParent)
66-
assertThat(StateEventType.Custom("foo").map()).isEqualTo(RustStateEventType.Custom("foo"))
71+
// Can't test Custom as it will try calling the Rust code, which is not available in unit tests
72+
// assertThat(StateEventType.Custom("foo").map()).isEqualTo(stateEventTypeFromString("foo"))
6773
}
6874
}

0 commit comments

Comments
 (0)