Improve handling members

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

@@ -54,7 +54,7 @@ class FakeMatrixClient(
     private var logoutFailure: Throwable? = null
 
     override fun getRoom(roomId: RoomId): MatrixRoom? {
-        return FakeMatrixRoom(roomId)
+        return FakeMatrixRoom(sessionId = sessionId, roomId = roomId)
     }
 
     override fun findDM(userId: UserId): MatrixRoom? {

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.test.A_ROOM_ID
-import io.element.android.libraries.matrix.test.timeline.FakeMatrixTimeline
 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,20 +44,23 @@ class FakeMatrixRoom(
     override val alternativeAliases: List<String> = emptyList(),
     override val isPublic: Boolean = true,
     override val isDirect: Boolean = false,
-    private val members: List<RoomMember> = emptyList(),
+    initialMembers: List<RoomMember> = emptyList(),
     private val matrixTimeline: MatrixTimeline = FakeMatrixTimeline(),
 ) : MatrixRoom {
 
     private var userDisplayNameResult = Result.success<String?>(null)
     private var userAvatarUrlResult = Result.success<String?>(null)
     private var dmMember: RoomMember? = null
-    private var fetchMemberResult: Result<Unit> = Result.success(Unit)
-
-    var areMembersFetched: Boolean = false
-        private set
+    private var updateMembersResult: Result<Unit> = Result.success(Unit)
 
     private var leaveRoomError: Throwable? = null
 
+    override val membersFlow: MutableStateFlow<List<RoomMember>> = MutableStateFlow(initialMembers)
+
+    override suspend fun updateMembers(): Result<Unit> {
+        return updateMembersResult
+    }
+
     override fun syncUpdateFlow(): Flow<Long> {
         return emptyFlow()
     }
@@ -62,18 +69,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
     }
@@ -82,22 +77,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)
@@ -139,7 +118,7 @@ class FakeMatrixRoom(
     }
 
     fun givenFetchMemberResult(result: Result<Unit>) {
-        fetchMemberResult = result
+        updateMembersResult = result
     }
 
     fun givenDmMember(roomMember: RoomMember) {