Merge branch 'develop' into feature/fga/image_loading

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

@@ -48,6 +48,8 @@ class FakeMatrixClient(
     private val notificationService: FakeNotificationService = FakeNotificationService(),
 ) : MatrixClient {
 
+    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)
     private var createDmResult: Result<RoomId> = Result.success(A_ROOM_ID)
     private var createDmFailure: Throwable? = null
@@ -63,6 +65,14 @@ class FakeMatrixClient(
         return findDmResult
     }
 
+    override suspend fun ignoreUser(userId: UserId): Result<Unit> {
+        return ignoreUserResult
+    }
+
+    override suspend fun unignoreUser(userId: UserId): Result<Unit> {
+        return unignoreUserResult
+    }
+
     override suspend fun createRoom(createRoomParams: CreateRoomParameters): Result<RoomId> {
         delay(100)
         return createRoomResult
@@ -119,6 +129,14 @@ class FakeMatrixClient(
         createDmResult = result
     }
 
+    fun givenIgnoreUserResult(result: Result<Unit>) {
+        ignoreUserResult = result
+    }
+
+    fun givenUnignoreUserResult(result: Result<Unit>) {
+        unignoreUserResult = result
+    }
+
     fun givenCreateDmError(failure: Throwable?) {
         createDmFailure = failure
     }

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

@@ -18,17 +18,21 @@ package io.element.android.libraries.matrix.test.room
 
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
+import io.element.android.libraries.matrix.api.core.SessionId
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.api.room.MatrixRoom
-import io.element.android.libraries.matrix.api.room.RoomMember
+import io.element.android.libraries.matrix.api.room.MatrixRoomMembersState
 import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
 import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.libraries.matrix.test.A_SESSION_ID
 import io.element.android.libraries.matrix.test.timeline.FakeMatrixTimeline
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.emptyFlow
 
 class FakeMatrixRoom(
+    override val sessionId: SessionId = A_SESSION_ID,
     override val roomId: RoomId = A_ROOM_ID,
     override val name: String? = null,
     override val bestName: String = "",
@@ -40,19 +44,16 @@ class FakeMatrixRoom(
     override val alternativeAliases: List<String> = emptyList(),
     override val isPublic: Boolean = true,
     override val isDirect: Boolean = false,
-    private val members: List<RoomMember> = emptyList(),
     private val matrixTimeline: MatrixTimeline = FakeMatrixTimeline(),
 ) : MatrixRoom {
 
+    private var ignoreResult: Result<Unit> = Result.success(Unit)
+    private var unignoreResult: Result<Unit> = Result.success(Unit)
     private var userDisplayNameResult = Result.success<String?>(null)
     private var userAvatarUrlResult = Result.success<String?>(null)
+    private var updateMembersResult: Result<Unit> = Result.success(Unit)
     private var acceptInviteResult = Result.success(Unit)
     private var rejectInviteResult = Result.success(Unit)
-    private var dmMember: RoomMember? = null
-    private var fetchMemberResult: Result<Unit> = Result.success(Unit)
-
-    var areMembersFetched: Boolean = false
-        private set
 
     var isInviteAccepted: Boolean = false
         private set
@@ -62,6 +63,12 @@ class FakeMatrixRoom(
 
     private var leaveRoomError: Throwable? = null
 
+    override val membersStateFlow: MutableStateFlow<MatrixRoomMembersState> = MutableStateFlow(MatrixRoomMembersState.Unknown)
+
+    override suspend fun updateMembers(): Result<Unit> {
+        return updateMembersResult
+    }
+
     override fun syncUpdateFlow(): Flow<Long> {
         return emptyFlow()
     }
@@ -70,18 +77,6 @@ class FakeMatrixRoom(
         return matrixTimeline
     }
 
-    override suspend fun fetchMembers(): Result<Unit> {
-        return fetchMemberResult.also { result ->
-            if (result.isSuccess) {
-                areMembersFetched = true
-            }
-        }
-    }
-
-    override fun getDmMember(): RoomMember? {
-        return dmMember
-    }
-
     override suspend fun userDisplayName(userId: UserId): Result<String?> {
         return userDisplayNameResult
     }
@@ -90,22 +85,6 @@ class FakeMatrixRoom(
         return userAvatarUrlResult
     }
 
-    override suspend fun members(): List<RoomMember> {
-        return members
-    }
-
-    override suspend fun memberCount(): Int {
-        if (fetchMemberResult.isSuccess) {
-            return members.count()
-        } else {
-            throw fetchMemberResult.exceptionOrNull()!!
-        }
-    }
-
-    override fun getMember(userId: UserId): RoomMember? {
-        return members.firstOrNull { it.userId == userId }
-    }
-
     override suspend fun sendMessage(message: String): Result<Unit> {
         delay(100)
         return Result.success(Unit)
@@ -155,12 +134,12 @@ class FakeMatrixRoom(
         this.leaveRoomError = throwable
     }
 
-    fun givenFetchMemberResult(result: Result<Unit>) {
-        fetchMemberResult = result
+    fun givenRoomMembersState(state: MatrixRoomMembersState) {
+        membersStateFlow.value = state
     }
 
-    fun givenDmMember(roomMember: RoomMember) {
-        this.dmMember = roomMember
+    fun givenUpdateMembersResult(result: Result<Unit>) {
+        updateMembersResult = result
     }
 
     fun givenUserDisplayNameResult(displayName: Result<String?>) {
@@ -179,4 +158,11 @@ class FakeMatrixRoom(
         rejectInviteResult = result
     }
 
+    fun givenIgnoreResult(result: Result<Unit>) {
+        ignoreResult = result
+    }
+
+    fun givenUnIgnoreResult(result: Result<Unit>) {
+        unignoreResult = result
+    }
 }