Merge branch 'develop' into feature/fga/mark_room_as_favorite

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

@@ -42,6 +42,7 @@ import io.element.android.libraries.matrix.api.room.StateEventType
 import io.element.android.libraries.matrix.api.room.location.AssetType
 import io.element.android.libraries.matrix.api.room.tags.RoomNotableTags
 import io.element.android.libraries.matrix.api.timeline.MatrixTimeline
+import io.element.android.libraries.matrix.api.timeline.ReceiptType
 import io.element.android.libraries.matrix.api.timeline.item.event.EventTimelineItem
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetDriver
 import io.element.android.libraries.matrix.api.widget.MatrixWidgetSettings
@@ -174,6 +175,9 @@ class FakeMatrixRoom(
     private val _notableTagsFlow: MutableStateFlow<RoomNotableTags> = MutableStateFlow(aRoomNotableTags())
     override val notableTagsFlow: Flow<RoomNotableTags> = _notableTagsFlow
 
+    private val _roomTypingMembersFlow: MutableSharedFlow<List<UserId>> = MutableSharedFlow(replay = 1)
+    override val roomTypingMembersFlow: Flow<List<UserId>> = _roomTypingMembersFlow
+
     override val membersStateFlow: MutableStateFlow<MatrixRoomMembersState> = MutableStateFlow(MatrixRoomMembersState.Unknown)
 
     override val roomNotificationSettingsStateFlow: MutableStateFlow<MatrixRoomNotificationSettingsState> =
@@ -393,6 +397,22 @@ class FakeMatrixRoom(
         }
     }
 
+
+    val markAsReadCalls = mutableListOf<ReceiptType?>()
+
+    override suspend fun markAsRead(receiptType: ReceiptType?): Result<Unit> {
+        markAsReadCalls.add(receiptType)
+        return Result.success(Unit)
+    }
+
+    var markAsUnreadReadCallCount = 0
+        private set
+
+    override suspend fun markAsUnread(): Result<Unit> {
+        markAsUnreadReadCallCount++
+        return Result.success(Unit)
+    }
+
     override suspend fun sendLocation(
         body: String,
         geoUri: String,
@@ -597,6 +617,10 @@ class FakeMatrixRoom(
     fun givenRoomInfo(roomInfo: MatrixRoomInfo) {
         _roomInfoFlow.tryEmit(roomInfo)
     }
+
+    fun givenRoomTypingMembers(typingMembers: List<UserId>) {
+        _roomTypingMembersFlow.tryEmit(typingMembers)
+    }
 }
 
 data class SendLocationInvocation(

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

@@ -37,8 +37,8 @@ fun aRoomSummaryFilled(
     isDirect: Boolean = false,
     avatarUrl: String? = null,
     lastMessage: RoomMessage? = aRoomMessage(),
-    numUnreadMentions: Int = 1,
-    numUnreadMessages: Int = 2,
+    numUnreadMentions: Int = 0,
+    numUnreadMessages: Int = 0,
     notificationMode: RoomNotificationMode? = null,
 ) = RoomSummary.Filled(
     aRoomSummaryDetails(
@@ -62,6 +62,7 @@ fun aRoomSummaryDetails(
     numUnreadMentions: Int = 0,
     numUnreadMessages: Int = 0,
     numUnreadNotifications: Int = 0,
+    isMarkedUnread: Boolean = false,
     notificationMode: RoomNotificationMode? = null,
     inviter: RoomMember? = null,
     canonicalAlias: String? = null,
@@ -76,6 +77,7 @@ fun aRoomSummaryDetails(
     numUnreadMentions = numUnreadMentions,
     numUnreadMessages = numUnreadMessages,
     numUnreadNotifications = numUnreadNotifications,
+    isMarkedUnread = isMarkedUnread,
     userDefinedNotificationMode = notificationMode,
     inviter = inviter,
     canonicalAlias = canonicalAlias,

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

@@ -18,6 +18,7 @@ package io.element.android.libraries.matrix.test.roomlist
 
 import io.element.android.libraries.matrix.api.roomlist.DynamicRoomList
 import io.element.android.libraries.matrix.api.roomlist.RoomList
+import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomListService
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -61,13 +62,13 @@ class FakeRoomListService : RoomListService {
     override val allRooms: DynamicRoomList = SimplePagedRoomList(
         allRoomSummariesFlow,
         allRoomsLoadingStateFlow,
-        MutableStateFlow(DynamicRoomList.Filter.None)
+        MutableStateFlow(RoomListFilter.all())
     )
 
     override val invites: RoomList = SimplePagedRoomList(
         inviteRoomSummariesFlow,
         inviteRoomsLoadingStateFlow,
-        MutableStateFlow(DynamicRoomList.Filter.None)
+        MutableStateFlow(RoomListFilter.all())
     )
 
     override fun updateAllRoomsVisibleRange(range: IntRange) {

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

@@ -18,6 +18,7 @@ package io.element.android.libraries.matrix.test.roomlist
 
 import io.element.android.libraries.matrix.api.roomlist.DynamicRoomList
 import io.element.android.libraries.matrix.api.roomlist.RoomList
+import io.element.android.libraries.matrix.api.roomlist.RoomListFilter
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -26,7 +27,7 @@ import kotlinx.coroutines.flow.getAndUpdate
 data class SimplePagedRoomList(
     override val summaries: StateFlow<List<RoomSummary>>,
     override val loadingState: StateFlow<RoomList.LoadingState>,
-    override val currentFilter: MutableStateFlow<DynamicRoomList.Filter>
+    override val currentFilter: MutableStateFlow<RoomListFilter>
 ) : DynamicRoomList {
     override val pageSize: Int = Int.MAX_VALUE
     override val loadedPages = MutableStateFlow(1)
@@ -40,7 +41,7 @@ data class SimplePagedRoomList(
         loadedPages.emit(1)
     }
 
-    override suspend fun updateFilter(filter: DynamicRoomList.Filter) {
+    override suspend fun updateFilter(filter: RoomListFilter) {
         currentFilter.emit(filter)
     }
 

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

@@ -24,7 +24,7 @@ class FakeCallWidgetSettingsProvider(
 ) : CallWidgetSettingsProvider {
     val providedBaseUrls = mutableListOf<String>()
 
-    override fun provide(baseUrl: String, widgetId: String): MatrixWidgetSettings {
+    override fun provide(baseUrl: String, widgetId: String, encrypted: Boolean): MatrixWidgetSettings {
         providedBaseUrls += baseUrl
         return provideFn(baseUrl, widgetId)
     }