From 85c715f3d1188d80d7554719b38a6d5ba9e49ac7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Dec 2023 18:09:58 +0000
Subject: [PATCH 1/2] Update dependency org.matrix.rustcomponents:sdk-android
 to v0.1.75

---
 gradle/libs.versions.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5b130186c7..83053bae1e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -147,7 +147,7 @@ jsoup = "org.jsoup:jsoup:1.17.1"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:1.3.1"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.74"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.75"
 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" }

From 436220d6f6d6f7a706ba348fdbe19e8e3058278a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 6 Dec 2023 10:40:59 +0100
Subject: [PATCH 2/2] Map new CALL_MEMBER state, and fix issue on `fun
 canUserJoinCall()`.

---
 .../element/android/libraries/matrix/api/room/MatrixRoom.kt | 3 ++-
 .../android/libraries/matrix/api/room/StateEventType.kt     | 1 +
 .../android/libraries/matrix/impl/room/RustMatrixRoom.kt    | 6 ------
 .../android/libraries/matrix/impl/room/StateEventType.kt    | 2 ++
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
index d7c8d7f49c..5f8c79d771 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/MatrixRoom.kt
@@ -132,7 +132,8 @@ interface MatrixRoom : Closeable {
 
     suspend fun canUserTriggerRoomNotification(userId: UserId): Result<Boolean>
 
-    suspend fun canUserJoinCall(userId: UserId): Result<Boolean>
+    suspend fun canUserJoinCall(userId: UserId): Result<Boolean> =
+        canUserSendState(userId, StateEventType.CALL_MEMBER)
 
     suspend fun updateAvatar(mimeType: String, data: ByteArray): Result<Unit>
 
diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
index 50cde59b37..3cfacf4a23 100644
--- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
+++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/StateEventType.kt
@@ -20,6 +20,7 @@ enum class StateEventType {
     POLICY_RULE_ROOM,
     POLICY_RULE_SERVER,
     POLICY_RULE_USER,
+    CALL_MEMBER,
     ROOM_ALIASES,
     ROOM_AVATAR,
     ROOM_CANONICAL_ALIAS,
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
index 5bf2310048..5d1292a90e 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RustMatrixRoom.kt
@@ -364,12 +364,6 @@ class RustMatrixRoom(
         }
     }
 
-    override suspend fun canUserJoinCall(userId: UserId): Result<Boolean> {
-        return runCatching {
-            innerRoom.canUserSendState(userId.value, StateEventType.ROOM_MEMBER_EVENT.map())
-        }
-    }
-
     override suspend fun sendImage(file: File, thumbnailFile: File, imageInfo: ImageInfo, progressCallback: ProgressCallback?): Result<MediaUploadHandler> {
         return sendAttachment(listOf(file, thumbnailFile)) {
             innerTimeline.sendImage(file.path, thumbnailFile.path, imageInfo.map(), progressCallback?.toProgressWatcher())
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
index 2cd09e213c..fa2b731b61 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/StateEventType.kt
@@ -23,6 +23,7 @@ fun StateEventType.map(): RustStateEventType = when (this) {
     StateEventType.POLICY_RULE_ROOM -> RustStateEventType.POLICY_RULE_ROOM
     StateEventType.POLICY_RULE_SERVER -> RustStateEventType.POLICY_RULE_SERVER
     StateEventType.POLICY_RULE_USER -> RustStateEventType.POLICY_RULE_USER
+    StateEventType.CALL_MEMBER -> RustStateEventType.CALL_MEMBER
     StateEventType.ROOM_ALIASES -> RustStateEventType.ROOM_ALIASES
     StateEventType.ROOM_AVATAR -> RustStateEventType.ROOM_AVATAR
     StateEventType.ROOM_CANONICAL_ALIAS -> RustStateEventType.ROOM_CANONICAL_ALIAS
@@ -47,6 +48,7 @@ fun RustStateEventType.map(): StateEventType = when (this) {
     RustStateEventType.POLICY_RULE_ROOM -> StateEventType.POLICY_RULE_ROOM
     RustStateEventType.POLICY_RULE_SERVER -> StateEventType.POLICY_RULE_SERVER
     RustStateEventType.POLICY_RULE_USER -> StateEventType.POLICY_RULE_USER
+    RustStateEventType.CALL_MEMBER -> StateEventType.CALL_MEMBER
     RustStateEventType.ROOM_ALIASES -> StateEventType.ROOM_ALIASES
     RustStateEventType.ROOM_AVATAR -> StateEventType.ROOM_AVATAR
     RustStateEventType.ROOM_CANONICAL_ALIAS -> StateEventType.ROOM_CANONICAL_ALIAS