Merge branch 'develop' into feature/fga/live_location_rendering

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/core/RoomIdOrAlias.kt

@@ -27,6 +27,16 @@ sealed interface RoomIdOrAlias : Parcelable {
             is Id -> roomId.value
             is Alias -> roomAlias.value
         }
+
+    companion object {
+        fun from(id: String): RoomIdOrAlias? {
+            return when {
+                MatrixPatterns.isRoomId(id) -> Id(RoomId(id))
+                MatrixPatterns.isRoomAlias(id) -> Alias(RoomAlias(id))
+                else -> null
+            }
+        }
+    }
 }
 
 fun RoomId.toRoomIdOrAlias() = RoomIdOrAlias.Id(this)

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/mxc/MxcTools.kt

@@ -17,3 +17,18 @@ interface MxcTools {
      */
     fun mxcUri2FilePath(mxcUri: String): String?
 }
+
+/**
+ * "mxc" scheme, including "://". So "mxc://".
+ */
+const val MATRIX_CONTENT_URI_SCHEME = "mxc://"
+
+/**
+ * Return true if the String starts with "mxc://".
+ */
+fun String.isMxcUrl() = startsWith(MATRIX_CONTENT_URI_SCHEME)
+
+/**
+ * Remove the "mxc://" prefix. No op if the String is not a Mxc URL.
+ */
+fun String.removeMxcPrefix() = removePrefix(MATRIX_CONTENT_URI_SCHEME)

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/notification/NotificationData.kt

@@ -95,7 +95,6 @@ sealed interface NotificationContent {
         data object PolicyRuleRoom : StateEvent
         data object PolicyRuleServer : StateEvent
         data object PolicyRuleUser : StateEvent
-        data object RoomAliases : StateEvent
         data object RoomAvatar : StateEvent
         data object RoomCanonicalAlias : StateEvent
         data object RoomCreate : StateEvent

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

@@ -13,7 +13,6 @@ sealed interface StateEventType {
     data object PolicyRuleServer : StateEventType
     data object PolicyRuleUser : StateEventType
     data object CallMember : StateEventType
-    data object RoomAliases : StateEventType
     data object RoomAvatar : StateEventType
     data object RoomCanonicalAlias : StateEventType
     data object RoomCreate : StateEventType

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/MsgType.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2026 Element Creations Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial.
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.libraries.matrix.api.timeline
+
+enum class MsgType {
+    MSG_TYPE_TEXT,
+    MSG_TYPE_EMOTE,
+
+    // For future support
+    MSG_TYPE_SNOW,
+
+    // For future support
+    MSG_TYPE_CONFETTI,
+}

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/Timeline.kt

@@ -69,6 +69,8 @@ interface Timeline : AutoCloseable {
         body: String,
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
+        msgType: MsgType = MsgType.MSG_TYPE_TEXT,
+        asPlainText: Boolean = false,
     ): Result<Unit>
 
     suspend fun editMessage(
@@ -90,6 +92,7 @@ interface Timeline : AutoCloseable {
         htmlBody: String?,
         intentionalMentions: List<IntentionalMention>,
         fromNotification: Boolean = false,
+        msgType: MsgType = MsgType.MSG_TYPE_TEXT,
     ): Result<Unit>
 
     suspend fun sendImage(

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/timeline/item/event/OtherState.kt

@@ -16,7 +16,6 @@ sealed interface OtherState {
     data object PolicyRuleRoom : OtherState
     data object PolicyRuleServer : OtherState
     data object PolicyRuleUser : OtherState
-    data object RoomAliases : OtherState
     data class RoomAvatar(val url: String?) : OtherState
     data object RoomCanonicalAlias : OtherState
     data object RoomCreate : OtherState