Merge pull request #2351 from element-hq/renovate/org.matrix.rustcomponents-sdk-android-0.x

Update dependency org.matrix.rustcomponents:sdk-android to v0.1.97

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt

@@ -139,7 +139,7 @@ class MessagesPresenter @AssistedInject constructor(
         val userHasPermissionToSendMessage by room.canSendMessageAsState(type = MessageEventType.ROOM_MESSAGE, updateKey = syncUpdateFlow.value)
         val userHasPermissionToRedactOwn by room.canRedactOwnAsState(updateKey = syncUpdateFlow.value)
         val userHasPermissionToRedactOther by room.canRedactOtherAsState(updateKey = syncUpdateFlow.value)
-        val userHasPermissionToSendReaction by room.canSendMessageAsState(type = MessageEventType.REACTION_SENT, updateKey = syncUpdateFlow.value)
+        val userHasPermissionToSendReaction by room.canSendMessageAsState(type = MessageEventType.REACTION, updateKey = syncUpdateFlow.value)
         val roomName: AsyncData<String> by remember {
             derivedStateOf { roomInfo?.name?.let { AsyncData.Success(it) } ?: AsyncData.Uninitialized }
         }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelinePresenter.kt

@@ -97,7 +97,7 @@ class TimelinePresenter @AssistedInject constructor(
         val paginationState by timeline.paginationState.collectAsState()
         val syncUpdateFlow = room.syncUpdateFlow.collectAsState()
         val userHasPermissionToSendMessage by room.canSendMessageAsState(type = MessageEventType.ROOM_MESSAGE, updateKey = syncUpdateFlow.value)
-        val userHasPermissionToSendReaction by room.canSendMessageAsState(type = MessageEventType.REACTION_SENT, updateKey = syncUpdateFlow.value)
+        val userHasPermissionToSendReaction by room.canSendMessageAsState(type = MessageEventType.REACTION, updateKey = syncUpdateFlow.value)
 
         val prevMostRecentItemId = rememberSaveable { mutableStateOf<String?>(null) }
         val newItemState = remember { mutableStateOf(NewEventState.None) }

gradle/libs.versions.toml

@@ -152,7 +152,7 @@ jsoup = "org.jsoup:jsoup:1.17.2"
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = "app.cash.molecule:molecule-runtime:1.3.2"
 timber = "com.jakewharton.timber:timber:5.0.1"
-matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.96"
+matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.1.97"
 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" }

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

@@ -28,9 +28,15 @@ enum class MessageEventType {
     KEY_VERIFICATION_KEY,
     KEY_VERIFICATION_MAC,
     KEY_VERIFICATION_DONE,
-    REACTION_SENT,
+    REACTION,
     ROOM_ENCRYPTED,
     ROOM_MESSAGE,
     ROOM_REDACTION,
-    STICKER
+    STICKER,
+    POLL_END,
+    POLL_RESPONSE,
+    POLL_START,
+    UNSTABLE_POLL_END,
+    UNSTABLE_POLL_RESPONSE,
+    UNSTABLE_POLL_START,
 }

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

@@ -76,12 +76,12 @@ import kotlinx.coroutines.withTimeout
 import org.matrix.rustcomponents.sdk.BackupState
 import org.matrix.rustcomponents.sdk.Client
 import org.matrix.rustcomponents.sdk.ClientDelegate
-import org.matrix.rustcomponents.sdk.FilterStateEventType
 import org.matrix.rustcomponents.sdk.FilterTimelineEventType
 import org.matrix.rustcomponents.sdk.NotificationProcessSetup
 import org.matrix.rustcomponents.sdk.PowerLevels
 import org.matrix.rustcomponents.sdk.Room
 import org.matrix.rustcomponents.sdk.RoomListItem
+import org.matrix.rustcomponents.sdk.StateEventType
 import org.matrix.rustcomponents.sdk.TaskHandle
 import org.matrix.rustcomponents.sdk.TimelineEventTypeFilter
 import org.matrix.rustcomponents.sdk.use
@@ -203,20 +203,20 @@ class RustMatrixClient(
 
     private val eventFilters = TimelineEventTypeFilter.exclude(
         listOf(
-            FilterStateEventType.ROOM_ALIASES,
-            FilterStateEventType.ROOM_CANONICAL_ALIAS,
-            FilterStateEventType.ROOM_GUEST_ACCESS,
-            FilterStateEventType.ROOM_HISTORY_VISIBILITY,
-            FilterStateEventType.ROOM_JOIN_RULES,
-            FilterStateEventType.ROOM_PINNED_EVENTS,
-            FilterStateEventType.ROOM_POWER_LEVELS,
-            FilterStateEventType.ROOM_SERVER_ACL,
-            FilterStateEventType.ROOM_TOMBSTONE,
-            FilterStateEventType.SPACE_CHILD,
-            FilterStateEventType.SPACE_PARENT,
-            FilterStateEventType.POLICY_RULE_ROOM,
-            FilterStateEventType.POLICY_RULE_SERVER,
-            FilterStateEventType.POLICY_RULE_USER,
+            StateEventType.ROOM_ALIASES,
+            StateEventType.ROOM_CANONICAL_ALIAS,
+            StateEventType.ROOM_GUEST_ACCESS,
+            StateEventType.ROOM_HISTORY_VISIBILITY,
+            StateEventType.ROOM_JOIN_RULES,
+            StateEventType.ROOM_PINNED_EVENTS,
+            StateEventType.ROOM_POWER_LEVELS,
+            StateEventType.ROOM_SERVER_ACL,
+            StateEventType.ROOM_TOMBSTONE,
+            StateEventType.SPACE_CHILD,
+            StateEventType.SPACE_PARENT,
+            StateEventType.POLICY_RULE_ROOM,
+            StateEventType.POLICY_RULE_SERVER,
+            StateEventType.POLICY_RULE_USER,
         ).map(FilterTimelineEventType::State)
     )
 

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

@@ -31,11 +31,17 @@ fun MessageEventType.map(): MessageLikeEventType = when (this) {
     MessageEventType.KEY_VERIFICATION_KEY -> MessageLikeEventType.KEY_VERIFICATION_KEY
     MessageEventType.KEY_VERIFICATION_MAC -> MessageLikeEventType.KEY_VERIFICATION_MAC
     MessageEventType.KEY_VERIFICATION_DONE -> MessageLikeEventType.KEY_VERIFICATION_DONE
-    MessageEventType.REACTION_SENT -> MessageLikeEventType.REACTION_SENT
+    MessageEventType.REACTION -> MessageLikeEventType.REACTION
     MessageEventType.ROOM_ENCRYPTED -> MessageLikeEventType.ROOM_ENCRYPTED
     MessageEventType.ROOM_MESSAGE -> MessageLikeEventType.ROOM_MESSAGE
     MessageEventType.ROOM_REDACTION -> MessageLikeEventType.ROOM_REDACTION
     MessageEventType.STICKER -> MessageLikeEventType.STICKER
+    MessageEventType.POLL_END -> MessageLikeEventType.POLL_END
+    MessageEventType.POLL_RESPONSE -> MessageLikeEventType.POLL_RESPONSE
+    MessageEventType.POLL_START -> MessageLikeEventType.POLL_START
+    MessageEventType.UNSTABLE_POLL_END -> MessageLikeEventType.UNSTABLE_POLL_END
+    MessageEventType.UNSTABLE_POLL_RESPONSE -> MessageLikeEventType.UNSTABLE_POLL_RESPONSE
+    MessageEventType.UNSTABLE_POLL_START -> MessageLikeEventType.UNSTABLE_POLL_START
 }
 
 fun MessageLikeEventType.map(): MessageEventType = when (this) {
@@ -50,9 +56,15 @@ fun MessageLikeEventType.map(): MessageEventType = when (this) {
     MessageLikeEventType.KEY_VERIFICATION_KEY -> MessageEventType.KEY_VERIFICATION_KEY
     MessageLikeEventType.KEY_VERIFICATION_MAC -> MessageEventType.KEY_VERIFICATION_MAC
     MessageLikeEventType.KEY_VERIFICATION_DONE -> MessageEventType.KEY_VERIFICATION_DONE
-    MessageLikeEventType.REACTION_SENT -> MessageEventType.REACTION_SENT
+    MessageLikeEventType.REACTION -> MessageEventType.REACTION
     MessageLikeEventType.ROOM_ENCRYPTED -> MessageEventType.ROOM_ENCRYPTED
     MessageLikeEventType.ROOM_MESSAGE -> MessageEventType.ROOM_MESSAGE
     MessageLikeEventType.ROOM_REDACTION -> MessageEventType.ROOM_REDACTION
     MessageLikeEventType.STICKER -> MessageEventType.STICKER
+    MessageLikeEventType.POLL_END -> MessageEventType.POLL_END
+    MessageLikeEventType.POLL_RESPONSE -> MessageEventType.POLL_RESPONSE
+    MessageLikeEventType.POLL_START -> MessageEventType.POLL_START
+    MessageLikeEventType.UNSTABLE_POLL_END -> MessageEventType.UNSTABLE_POLL_END
+    MessageLikeEventType.UNSTABLE_POLL_RESPONSE -> MessageEventType.UNSTABLE_POLL_RESPONSE
+    MessageLikeEventType.UNSTABLE_POLL_START -> MessageEventType.UNSTABLE_POLL_START
 }