Merge branch 'develop' into fix/5794-account-data-api

2026-11-02 21:05:28 +00:00 · 2026-08-11 14:03:39 +02:00
parent 33bdf968c5 6c7f4d3b24
commit 90a2a258d1
650 changed files with 4781 additions and 3197 deletions
@@ -54,7 +54,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
 import java.util.Optional

-interface MatrixClient {
+interface MatrixClient : UrlContentFetcher {
    val sessionId: SessionId
    val deviceId: DeviceId

@@ -99,6 +99,12 @@ interface MatrixClient {

    /** Clears both m.status and m.call profile fields (maps to DELETE on the profile endpoint per MSC4426). */
    suspend fun clearUserStatus(): Result<Unit>
+
+    /** Whether the homeserver advertises support for user status (MSC4426). */
+    suspend fun isUserStatusSupported(): Result<Boolean>
+
+    /** Enable or disable automatically setting the user's status to "in a call" (m.call) while in a call. */
+    fun enableAutomaticCallStatus(enabled: Boolean)
    suspend fun joinRoom(roomId: RoomId): Result<RoomInfo?>
    suspend fun joinRoomByIdOrAlias(roomIdOrAlias: RoomIdOrAlias, serverNames: List<String>): Result<RoomInfo?>
    suspend fun knockRoom(roomIdOrAlias: RoomIdOrAlias, message: String, serverNames: List<String>): Result<RoomInfo?>
@@ -167,11 +173,6 @@ interface MatrixClient {
     */
    fun userIdServerName(): String

-    /**
-     * Execute generic GET requests through the SDKs internal HTTP client.
-     */
-    suspend fun getUrl(url: String): Result<ByteArray>
-
    /**
     * Get a room preview for a given room ID or alias. This is especially useful for rooms that the user is not a member of, or hasn't joined yet.
     */
@@ -0,0 +1,18 @@
+/*
+ * 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
+
+import java.lang.AutoCloseable
+
+/**
+ * A Matrix client in an 'unauthenticated' state that can still be used to resolve URLs.
+ *
+ * Note: this client implements an [AutoCloseable] interface, so using [AutoCloseable.close] or [AutoCloseable.use] will clean up any resources associated
+ * with it, such as temporary files.
+ */
+interface TemporaryMatrixClient : UrlContentFetcher, AutoCloseable
@@ -0,0 +1,15 @@
+/*
+ * 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
+
+/**
+ * Factory to create a temporary [TemporaryMatrixClient] for a given home server URL.
+ */
+interface TemporaryMatrixClientFactory {
+    suspend fun create(homeServerUrl: String): Result<TemporaryMatrixClient>
+}
@@ -0,0 +1,18 @@
+/*
+ * 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
+
+/**
+ * An interface to fetch content from a URL using a simple GET request.
+ */
+fun interface UrlContentFetcher {
+    /**
+     * Execute generic GET requests through the SDKs internal HTTP client.
+     */
+    suspend fun getUrl(url: String): Result<ByteArray>
+}
@@ -11,6 +11,8 @@ package io.element.android.libraries.matrix.api.auth
 import io.element.android.libraries.matrix.api.BuildConfig

 object OAuthConfig {
+    // This *can* be null if the build time config field is not set
+    @Suppress("UNNECESSARY_SAFE_CALL")
    val CLIENT_URI = BuildConfig.OAUTH_CLIENT_URI_PATH?.let {
        // Concatenate the base URI and the path, ensuring there is exactly one '/' between them
        "${BuildConfig.CLIENT_URI.trimEnd('/')}/${it.trimStart('/')}"
@@ -104,4 +104,5 @@ fun RoomMember.toMatrixUser() = MatrixUser(
    userId = userId,
    displayName = displayName.takeUnless { membership == RoomMembershipState.BAN },
    avatarUrl = avatarUrl.takeUnless { membership == RoomMembershipState.BAN },
+    displayedStatus = displayedStatus,
 )
@@ -7,12 +7,19 @@

 package io.element.android.libraries.matrix.api.scanner

+import io.element.android.libraries.matrix.api.UrlContentFetcher
+import io.element.android.libraries.matrix.api.core.SessionId
+
 /**
 * Provides the URL of the content scanner service for a given homeserver, if any is set up.
 */
 fun interface ContentScannerUrlProvider {
    /**
-     * Returns the URL of the content scanner service for the given [homeserver], or `null` if no content scanner is set up.
+     * Returns the URL of the content scanner service for the given [sessionId], or `null` if no content scanner is set up.
     */
-    suspend fun getContentScannerUrl(homeserver: String): Result<String?>
+    suspend fun getContentScannerUrl(sessionId: SessionId): Result<String?>
+
+    fun interface Factory {
+        fun create(urlContentFetcher: UrlContentFetcher): ContentScannerUrlProvider
+    }
 }
@@ -11,6 +11,7 @@ package io.element.android.libraries.matrix.api.timeline.item.event
 import androidx.compose.runtime.Immutable
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.user.DisplayedStatus
+import io.element.android.libraries.matrix.api.user.MatrixUser

@Immutable
 sealed interface ProfileDetails {
@@ -60,3 +61,20 @@ fun ProfileDetails.getAvatarUrl(): String? {
        else -> null
    }
 }
+
+fun ProfileDetails.toMatrixUser(userId: UserId): MatrixUser {
+    return when (this) {
+        is ProfileDetails.Ready -> MatrixUser(
+            userId = userId,
+            displayName = displayName,
+            avatarUrl = avatarUrl,
+            displayedStatus = displayedStatus,
+        )
+        else -> MatrixUser(
+            userId = userId,
+            displayName = null,
+            avatarUrl = null,
+            displayedStatus = null,
+        )
+    }
+}
@@ -13,6 +13,9 @@ import kotlinx.parcelize.Parcelize

@Immutable
 sealed interface DisplayedStatus : Parcelable {
+    /** Useful for adding extension methods. */
+    companion object
+
    /** Status set manually by the user via m.status. */
    @Parcelize
    data class UserSet(val status: UserStatus) : DisplayedStatus
@@ -21,6 +24,6 @@ sealed interface DisplayedStatus : Parcelable {
    @Parcelize
    data class InCall(
        /** Unix timestamp in seconds when the call was joined (from m.call.call_joined_ts). */
-        val callJoinedTs: Long,
+        val callJoinedTs: Long?,
    ) : DisplayedStatus
 }