Merge branch 'develop' into feature/fga/image_loading

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

@@ -60,6 +60,7 @@ class FakeMatrixClient(
     private val getRoomResults = mutableMapOf<RoomId, MatrixRoom>()
     private val searchUserResults = mutableMapOf<String, Result<MatrixSearchUserResults>>()
     private val getProfileResults = mutableMapOf<UserId, Result<MatrixUser>>()
+    private var uploadMediaResult: Result<String> = Result.success(AN_AVATAR_URL)
 
     override fun getRoom(roomId: RoomId): MatrixRoom? {
         return getRoomResults[roomId]
@@ -92,6 +93,10 @@ class FakeMatrixClient(
         return getProfileResults[userId] ?: Result.failure(IllegalStateException("No profile found for $userId"))
     }
 
+    override suspend fun searchUsers(searchTerm: String, limit: Long): Result<MatrixSearchUserResults> {
+        return searchUserResults[searchTerm] ?: Result.failure(IllegalStateException("No response defined for $searchTerm"))
+    }
+
     override fun startSync() = Unit
 
     override fun stopSync() = Unit
@@ -111,6 +116,10 @@ class FakeMatrixClient(
         return userAvatarURLString
     }
 
+    override suspend fun uploadMedia(mimeType: String, data: ByteArray): Result<String> {
+        return uploadMediaResult
+    }
+
     override fun sessionVerificationService(): SessionVerificationService = sessionVerificationService
 
     override fun pushersService(): PushersService = pushersService
@@ -123,10 +132,6 @@ class FakeMatrixClient(
         return RoomMembershipObserver()
     }
 
-    override suspend fun searchUsers(searchTerm: String, limit: Long): Result<MatrixSearchUserResults> {
-        return searchUserResults[searchTerm] ?: Result.failure(IllegalStateException("No response defined for $searchTerm"))
-    }
-
     // Mocks
 
     fun givenLogoutError(failure: Throwable?) {
@@ -168,4 +173,8 @@ class FakeMatrixClient(
     fun givenGetProfileResult(userId: UserId, result: Result<MatrixUser>) {
         getProfileResults[userId] = result
     }
+
+    fun givenUploadMediaResult(result: Result<String>) {
+        uploadMediaResult = result
+    }
 }