Merge branch 'vector-im:develop' into develop

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

@@ -42,6 +42,7 @@ interface MatrixClient : Closeable {
     suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId>
     suspend fun createDM(userId: UserId): Result<RoomId>
     suspend fun getProfile(userId: UserId): Result<MatrixUser>
+    suspend fun searchUsers(searchTerm: String, limit: Long): Result<MatrixSearchUserResults>
     fun startSync()
     fun stopSync()
     fun mediaResolver(): MediaResolver
@@ -58,9 +59,10 @@ interface MatrixClient : Closeable {
         height: Long
     ): Result<ByteArray>
 
+    suspend fun uploadMedia(mimeType: String, data: ByteArray): Result<String>
+
     fun onSlidingSyncUpdate()
 
     fun roomMembershipObserver(): RoomMembershipObserver
 
-    suspend fun searchUsers(searchTerm: String, limit: Long): Result<MatrixSearchUserResults>
 }

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

@@ -17,7 +17,6 @@
 package io.element.android.libraries.matrix.api.room
 
 import io.element.android.libraries.matrix.api.core.UserId
-import io.element.android.libraries.matrix.api.user.MatrixUser
 
 data class RoomMember(
     val userId: UserId,
@@ -30,12 +29,6 @@ data class RoomMember(
     val isIgnored: Boolean,
 )
 
-fun RoomMember.toMatrixUser() = MatrixUser(
-    userId = userId,
-    displayName = displayName,
-    avatarUrl = avatarUrl,
-)
-
 enum class RoomMembershipState {
     BAN, INVITE, JOIN, KNOCK, LEAVE
 }