Merge pull request #3715 from element-hq/renovate/org.matrix.rustcomp…

…onents-sdk-android-0.x Update dependency org.matrix.rustcomponents:sdk-android to v0.2.56
element-hq · Oct 22, 2024 · 1bfa43b · 1bfa43b
2 parents 79352dd + 3b8b1d5
commit 1bfa43b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -168,7 +168,7 @@ jsoup = "org.jsoup:jsoup:1.18.1"
 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.55"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.56"
 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/.../main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt b/.../main/kotlin/io/element/android/libraries/matrix/impl/encryption/RustEncryptionService.kt
@@ -205,7 +205,7 @@ internal class RustEncryptionService(
     }
 
     override suspend fun pinUserIdentity(userId: UserId): Result<Unit> = runCatching {
-        val userIdentity = service.getUserIdentity(userId.value) ?: error("User identity not found")
+        val userIdentity = service.userIdentity(userId.value) ?: error("User identity not found")
         userIdentity.pin()
     }
 }
diff --git a/.../src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt b/.../src/main/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapper.kt
@@ -36,10 +36,11 @@ object RoomMemberMapper {
 
     fun mapMembership(membershipState: RustMembershipState): RoomMembershipState =
         when (membershipState) {
-            RustMembershipState.BAN -> RoomMembershipState.BAN
-            RustMembershipState.INVITE -> RoomMembershipState.INVITE
-            RustMembershipState.JOIN -> RoomMembershipState.JOIN
-            RustMembershipState.KNOCK -> RoomMembershipState.KNOCK
-            RustMembershipState.LEAVE -> RoomMembershipState.LEAVE
+            RustMembershipState.Ban -> RoomMembershipState.BAN
+            RustMembershipState.Invite -> RoomMembershipState.INVITE
+            RustMembershipState.Join -> RoomMembershipState.JOIN
+            RustMembershipState.Knock -> RoomMembershipState.KNOCK
+            RustMembershipState.Leave -> RoomMembershipState.LEAVE
+            is RustMembershipState.Custom -> TODO()
         }
 }
diff --git a/...src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomMember.kt b/...src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomMember.kt
@@ -16,7 +16,7 @@ fun aRustRoomMember(
     userId: UserId,
     displayName: String? = null,
     avatarUrl: String? = null,
-    membership: MembershipState = MembershipState.JOIN,
+    membership: MembershipState = MembershipState.Join,
     isNameAmbiguous: Boolean = false,
     powerLevel: Long = 0L,
     isIgnored: Boolean = false,

diff --git a/.../test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapperTest.kt b/.../test/kotlin/io/element/android/libraries/matrix/impl/room/member/RoomMemberMapperTest.kt
@@ -24,10 +24,10 @@ class RoomMemberMapperTest {
 
     @Test
     fun mapMembership() {
-        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.BAN)).isEqualTo(RoomMembershipState.BAN)
-        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.INVITE)).isEqualTo(RoomMembershipState.INVITE)
-        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.JOIN)).isEqualTo(RoomMembershipState.JOIN)
-        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.KNOCK)).isEqualTo(RoomMembershipState.KNOCK)
-        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.LEAVE)).isEqualTo(RoomMembershipState.LEAVE)
+        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.Ban)).isEqualTo(RoomMembershipState.BAN)
+        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.Invite)).isEqualTo(RoomMembershipState.INVITE)
+        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.Join)).isEqualTo(RoomMembershipState.JOIN)
+        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.Knock)).isEqualTo(RoomMembershipState.KNOCK)
+        assertThat(RoomMemberMapper.mapMembership(RustMembershipState.Leave)).isEqualTo(RoomMembershipState.LEAVE)
     }
 }