Merge branch 'develop' into dla/feature/room_list_decoration

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

@@ -47,6 +47,9 @@ interface MatrixClient : Closeable {
     suspend fun createDM(userId: UserId): Result<RoomId>
     suspend fun getProfile(userId: UserId): Result<MatrixUser>
     suspend fun searchUsers(searchTerm: String, limit: Long): Result<MatrixSearchUserResults>
+    suspend fun setDisplayName(displayName: String): Result<Unit>
+    suspend fun uploadAvatar(mimeType: String, data: ByteArray): Result<Unit>
+    suspend fun removeAvatar(): Result<Unit>
     fun syncService(): SyncService
     fun sessionVerificationService(): SessionVerificationService
     fun pushersService(): PushersService

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

@@ -276,6 +276,23 @@ class RustMatrixClient constructor(
             }
         }
 
+    override suspend fun setDisplayName(displayName: String): Result<Unit> =
+        withContext(sessionDispatcher) {
+            runCatching { client.setDisplayName(displayName) }
+        }
+
+    @OptIn(ExperimentalUnsignedTypes::class)
+    override suspend fun uploadAvatar(mimeType: String, data: ByteArray): Result<Unit> =
+        withContext(sessionDispatcher) {
+            runCatching { client.uploadAvatar(mimeType, data.toUByteArray().toList()) }
+        }
+
+    override suspend fun removeAvatar(): Result<Unit> =
+        withContext(sessionDispatcher) {
+            runCatching { client.removeAvatar() }
+        }
+
+
     override fun syncService(): SyncService = rustSyncService
 
     override fun sessionVerificationService(): SessionVerificationService = verificationService

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

@@ -111,6 +111,9 @@ class RoomSummaryListProcessor(
             RoomListEntriesUpdate.Clear -> {
                 clear()
             }
+            is RoomListEntriesUpdate.Truncate -> {
+                subList(update.length.toInt(), size).clear()
+            }
         }
     }
 
@@ -119,7 +122,7 @@ class RoomSummaryListProcessor(
             RoomListEntry.Empty -> buildEmptyRoomSummary()
             is RoomListEntry.Filled -> buildAndCacheRoomSummaryForIdentifier(entry.roomId)
             is RoomListEntry.Invalidated -> {
-                roomSummariesByIdentifier[entry.roomId] ?: buildEmptyRoomSummary()
+                roomSummariesByIdentifier[entry.roomId] ?: buildAndCacheRoomSummaryForIdentifier(entry.roomId)
             }
         }
     }

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

@@ -98,6 +98,9 @@ internal class MatrixTimelineDiffProcessor(
             TimelineChange.CLEAR -> {
                 clear()
             }
+            TimelineChange.TRUNCATE -> {
+                // Not supported
+            }
         }
     }
 

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

@@ -49,7 +49,7 @@ internal class RustTracingTree(private val retrieveFromStackTrace: Boolean) : Ti
             line = location.line,
             level = logLevel,
             target = Target.ELEMENT.filter,
-            message = message,
+            message = if (tag != null) "[$tag] $message" else message,
         )
     }
 

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

@@ -58,6 +58,13 @@ class FakeMatrixClient(
     private val accountManagementUrlString: Result<String?> = Result.success(null),
 ) : MatrixClient {
 
+    var setDisplayNameCalled: Boolean = false
+        private set
+    var uploadAvatarCalled: Boolean = false
+        private set
+    var removeAvatarCalled: Boolean = false
+        private set
+
     private var ignoreUserResult: Result<Unit> = Result.success(Unit)
     private var unignoreUserResult: Result<Unit> = Result.success(Unit)
     private var createRoomResult: Result<RoomId> = Result.success(A_ROOM_ID)
@@ -69,6 +76,9 @@ class FakeMatrixClient(
     private val searchUserResults = mutableMapOf<String, Result<MatrixSearchUserResults>>()
     private val getProfileResults = mutableMapOf<UserId, Result<MatrixUser>>()
     private var uploadMediaResult: Result<String> = Result.success(AN_AVATAR_URL)
+    private var setDisplayNameResult: Result<Unit> = Result.success(Unit)
+    private var uploadAvatarResult: Result<Unit> = Result.success(Unit)
+    private var removeAvatarResult: Result<Unit> = Result.success(Unit)
 
     override suspend fun getRoom(roomId: RoomId): MatrixRoom? {
         return getRoomResults[roomId]
@@ -133,6 +143,7 @@ class FakeMatrixClient(
     override suspend fun getAccountManagementUrl(action: AccountManagementAction?): Result<String?> {
         return accountManagementUrlString
     }
+
     override suspend fun uploadMedia(
         mimeType: String,
         data: ByteArray,
@@ -141,6 +152,21 @@ class FakeMatrixClient(
         return uploadMediaResult
     }
 
+    override suspend fun setDisplayName(displayName: String): Result<Unit> = simulateLongTask {
+        setDisplayNameCalled = true
+        return setDisplayNameResult
+    }
+
+    override suspend fun uploadAvatar(mimeType: String, data: ByteArray): Result<Unit> = simulateLongTask {
+        uploadAvatarCalled = true
+        return uploadAvatarResult
+    }
+
+    override suspend fun removeAvatar(): Result<Unit> = simulateLongTask {
+        removeAvatarCalled = true
+        return removeAvatarResult
+    }
+
     override fun sessionVerificationService(): SessionVerificationService = sessionVerificationService
 
     override fun pushersService(): PushersService = pushersService
@@ -197,4 +223,16 @@ class FakeMatrixClient(
     fun givenUploadMediaResult(result: Result<String>) {
         uploadMediaResult = result
     }
+
+    fun givenSetDisplayNameResult(result: Result<Unit>) {
+        setDisplayNameResult = result
+    }
+
+    fun givenUploadAvatarResult(result: Result<Unit>) {
+        uploadAvatarResult = result
+    }
+
+    fun givenRemoveAvatarResult(result: Result<Unit>) {
+        removeAvatarResult = result
+    }
 }