Update dependency org.matrix.rustcomponents:sdk-android to v0.2.31 (#3145)

* Update dependency org.matrix.rustcomponents:sdk-android to v0.2.31

* Use new Rust client side sorting API

* Make `RoomListEntriesUpdate.describe()` an extension function

* Remove `RoomListSummary.Filled` and `RoomListSummary.Empty`

* Fix icon sizes to pass the lint checks

* Update screenshots

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
Co-authored-by: ElementBot <benoitm+elementbot@element.io>

features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/forward/ForwardMessagesPresenterTest.kt

@@ -25,7 +25,7 @@ import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.test.AN_EVENT_ID
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
-import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
+import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.timeline.FakeTimeline
 import io.element.android.libraries.matrix.test.timeline.LiveTimelineProvider
 import io.element.android.tests.testutils.WarmUpRule
@@ -64,7 +64,7 @@ class ForwardMessagesPresenterTest {
             presenter.present()
         }.test {
             skipItems(1)
-            val summary = aRoomSummaryDetails()
+            val summary = aRoomSummary()
             presenter.onRoomSelected(listOf(summary.roomId))
             val forwardingState = awaitItem()
             assertThat(forwardingState.forwardAction.isLoading()).isTrue()
@@ -88,7 +88,7 @@ class ForwardMessagesPresenterTest {
             presenter.present()
         }.test {
             skipItems(1)
-            val summary = aRoomSummaryDetails()
+            val summary = aRoomSummary()
             presenter.onRoomSelected(listOf(summary.roomId))
             skipItems(1)
             val failedForwardState = awaitItem()

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt

@@ -66,7 +66,7 @@ class EditDefaultNotificationSettingPresenter @AssistedInject constructor(
 
         val changeNotificationSettingAction: MutableState<AsyncAction<Unit>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
 
-        val roomsWithUserDefinedMode: MutableState<List<RoomSummary.Filled>> = remember {
+        val roomsWithUserDefinedMode: MutableState<List<RoomSummary>> = remember {
             mutableStateOf(listOf())
         }
 
@@ -115,7 +115,7 @@ class EditDefaultNotificationSettingPresenter @AssistedInject constructor(
             .launchIn(this)
     }
 
-    private fun CoroutineScope.observeRoomSummaries(roomsWithUserDefinedMode: MutableState<List<RoomSummary.Filled>>) {
+    private fun CoroutineScope.observeRoomSummaries(roomsWithUserDefinedMode: MutableState<List<RoomSummary>>) {
         roomListService.allRooms
             .summaries
             .onEach {
@@ -126,18 +126,18 @@ class EditDefaultNotificationSettingPresenter @AssistedInject constructor(
 
     private fun CoroutineScope.updateRoomsWithUserDefinedMode(
         summaries: List<RoomSummary>,
-        roomsWithUserDefinedMode: MutableState<List<RoomSummary.Filled>>
+        roomsWithUserDefinedMode: MutableState<List<RoomSummary>>
     ) = launch {
         val roomWithUserDefinedRules: Set<String> = notificationSettingsService.getRoomsWithUserDefinedRules().getOrThrow().toSet()
 
         val sortedSummaries = summaries
-            .filterIsInstance<RoomSummary.Filled>()
+            .filterIsInstance<RoomSummary>()
             .filter {
-                val room = matrixClient.getRoom(it.details.roomId) ?: return@filter false
-                roomWithUserDefinedRules.contains(it.identifier()) && isOneToOne == room.isOneToOne
+                val room = matrixClient.getRoom(it.roomId) ?: return@filter false
+                roomWithUserDefinedRules.contains(it.roomId.value) && isOneToOne == room.isOneToOne
             }
             // locale sensitive sorting
-            .sortedWith(compareBy(Collator.getInstance()) { it.details.name })
+            .sortedWith(compareBy(Collator.getInstance()) { it.name })
 
         roomsWithUserDefinedMode.value = sortedSummaries
     }

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingState.kt

@@ -24,7 +24,7 @@ import kotlinx.collections.immutable.ImmutableList
 data class EditDefaultNotificationSettingState(
     val isOneToOne: Boolean,
     val mode: RoomNotificationMode?,
-    val roomsWithUserDefinedMode: ImmutableList<RoomSummary.Filled>,
+    val roomsWithUserDefinedMode: ImmutableList<RoomSummary>,
     val changeNotificationSettingAction: AsyncAction<Unit>,
     val displayMentionsOnlyDisclaimer: Boolean,
     val eventSink: (EditDefaultNotificationSettingStateEvents) -> Unit,

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingStateProvider.kt

@@ -20,7 +20,6 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.ui.components.aRoomSummaryDetails
 import kotlinx.collections.immutable.persistentListOf
 
@@ -53,13 +52,11 @@ private fun anEditDefaultNotificationSettingsState(
 
 private fun aRoomSummary(
     name: String?,
-) = RoomSummary.Filled(
-    aRoomSummaryDetails(
-        roomId = RoomId("!roomId:domain"),
-        name = name,
-        avatarUrl = null,
-        isDirect = false,
-        lastMessage = null,
-        notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
-    )
+) = aRoomSummaryDetails(
+    roomId = RoomId("!roomId:domain"),
+    name = name,
+    avatarUrl = null,
+    isDirect = false,
+    lastMessage = null,
+    notificationMode = RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY,
 )

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingView.kt

@@ -89,7 +89,7 @@ fun EditDefaultNotificationSettingView(
         if (state.roomsWithUserDefinedMode.isNotEmpty()) {
             PreferenceCategory(title = stringResource(id = R.string.screen_notification_settings_edit_custom_settings_section_title)) {
                 state.roomsWithUserDefinedMode.forEach { summary ->
-                    val subtitle = when (summary.details.userDefinedNotificationMode) {
+                    val subtitle = when (summary.userDefinedNotificationMode) {
                         RoomNotificationMode.ALL_MESSAGES -> stringResource(id = R.string.screen_notification_settings_edit_mode_all_messages)
                         RoomNotificationMode.MENTIONS_AND_KEYWORDS_ONLY -> {
                             stringResource(id = R.string.screen_notification_settings_edit_mode_mentions_and_keywords)
@@ -99,7 +99,7 @@ fun EditDefaultNotificationSettingView(
                     }
                     ListItem(
                         headlineContent = {
-                            val roomName = summary.details.name
+                            val roomName = summary.name
                             Text(
                                 text = roomName ?: stringResource(id = CommonStrings.common_no_room_name),
                                 fontStyle = FontStyle.Italic.takeIf { roomName == null }
@@ -110,14 +110,14 @@ fun EditDefaultNotificationSettingView(
                         },
                         leadingContent = ListItemContent.Custom {
                             CompositeAvatar(
-                                avatarData = summary.details.getAvatarData(size = AvatarSize.CustomRoomNotificationSetting),
-                                heroes = summary.details.heroes.map { user ->
+                                avatarData = summary.getAvatarData(size = AvatarSize.CustomRoomNotificationSetting),
+                                heroes = summary.heroes.map { user ->
                                     user.getAvatarData(size = AvatarSize.CustomRoomNotificationSetting)
                                 }.toPersistentList()
                             )
                         },
                         onClick = {
-                            openRoomNotificationSettings(summary.details.roomId)
+                            openRoomNotificationSettings(summary.roomId)
                         }
                     )
                 }

features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/notifications/EditDefaultNotificationSettingsPresenterTest.kt

@@ -23,13 +23,12 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.preferences.impl.notifications.edit.EditDefaultNotificationSettingPresenter
 import io.element.android.features.preferences.impl.notifications.edit.EditDefaultNotificationSettingStateEvents
 import io.element.android.libraries.matrix.api.room.RoomNotificationMode
-import io.element.android.libraries.matrix.api.roomlist.RoomSummary
 import io.element.android.libraries.matrix.test.A_ROOM_ID
 import io.element.android.libraries.matrix.test.A_THROWABLE
 import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
-import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
+import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.tests.testutils.awaitLastSequentialItem
 import io.element.android.tests.testutils.consumeItemsUntilPredicate
@@ -72,11 +71,11 @@ class EditDefaultNotificationSettingsPresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            roomListService.postAllRooms(listOf(RoomSummary.Filled(aRoomSummaryDetails(notificationMode = RoomNotificationMode.ALL_MESSAGES))))
+            roomListService.postAllRooms(listOf(aRoomSummary(notificationMode = RoomNotificationMode.ALL_MESSAGES)))
             val loadedState = consumeItemsUntilPredicate { state ->
-                state.roomsWithUserDefinedMode.any { it.details.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }
+                state.roomsWithUserDefinedMode.any { it.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }
             }.last()
-            assertThat(loadedState.roomsWithUserDefinedMode.any { it.details.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
+            assertThat(loadedState.roomsWithUserDefinedMode.any { it.userDefinedNotificationMode == RoomNotificationMode.ALL_MESSAGES }).isTrue()
         }
     }
 

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListEvents.kt

@@ -20,7 +20,6 @@ import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.libraries.matrix.api.core.RoomId
 
 sealed interface RoomListEvents {
-    data class UpdateVisibleRange(val range: IntRange) : RoomListEvents
     data object DismissRequestVerificationPrompt : RoomListEvents
     data object DismissRecoveryKeyPrompt : RoomListEvents
     data object ToggleSearchResults : RoomListEvents

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt

@@ -78,8 +78,6 @@ import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-private const val EXTENDED_RANGE_SIZE = 40
-
 class RoomListPresenter @Inject constructor(
     private val client: MatrixClient,
     private val networkMonitor: NetworkMonitor,
@@ -124,7 +122,6 @@ class RoomListPresenter @Inject constructor(
 
         fun handleEvents(event: RoomListEvents) {
             when (event) {
-                is RoomListEvents.UpdateVisibleRange -> updateVisibleRange(event.range)
                 RoomListEvents.DismissRequestVerificationPrompt -> securityBannerDismissed = true
                 RoomListEvents.DismissRecoveryKeyPrompt -> securityBannerDismissed = true
                 RoomListEvents.ToggleSearchResults -> searchState.eventSink(RoomListSearchEvents.ToggleSearchVisibility)
@@ -286,16 +283,6 @@ class RoomListPresenter @Inject constructor(
                 }
         }
     }
-
-    private fun updateVisibleRange(range: IntRange) {
-        if (range.isEmpty()) return
-        val midExtendedRangeSize = EXTENDED_RANGE_SIZE / 2
-        val extendedRangeStart = (range.first - midExtendedRangeSize).coerceAtLeast(0)
-        // Safe to give bigger size than room list
-        val extendedRangeEnd = range.last + midExtendedRangeSize
-        val extendedRange = IntRange(extendedRangeStart, extendedRangeEnd)
-        client.roomListService.updateAllRoomsVisibleRange(extendedRange)
-    }
 }
 
 @VisibleForTesting

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt

@@ -30,17 +30,11 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.derivedStateOf
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.PreviewParameter
-import androidx.compose.ui.unit.Velocity
 import androidx.compose.ui.unit.dp
 import io.element.android.compound.theme.ElementTheme
 import io.element.android.compound.tokens.generated.CompoundIcons
@@ -171,25 +165,9 @@ private fun RoomsViewList(
     modifier: Modifier = Modifier,
 ) {
     val lazyListState = rememberLazyListState()
-    val visibleRange by remember {
-        derivedStateOf {
-            val layoutInfo = lazyListState.layoutInfo
-            val firstItemIndex = layoutInfo.visibleItemsInfo.firstOrNull()?.index ?: 0
-            val size = layoutInfo.visibleItemsInfo.size
-            firstItemIndex until firstItemIndex + size
-        }
-    }
-    val nestedScrollConnection = remember {
-        object : NestedScrollConnection {
-            override suspend fun onPostFling(consumed: Velocity, available: Velocity): Velocity {
-                eventSink(RoomListEvents.UpdateVisibleRange(visibleRange))
-                return super.onPostFling(consumed, available)
-            }
-        }
-    }
     LazyColumn(
         state = lazyListState,
-        modifier = modifier.nestedScroll(nestedScrollConnection),
+        modifier = modifier,
         // FAB height is 56dp, bottom padding is 16dp, we add 8dp as extra margin -> 56+16+8 = 80
         contentPadding = PaddingValues(bottom = 80.dp)
     ) {

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListDataSource.kt

@@ -54,7 +54,7 @@ class RoomListDataSource @Inject constructor(
     private val lock = Mutex()
     private val diffCache = MutableListDiffCache<RoomListRoomSummary>()
     private val diffCacheUpdater = DiffCacheUpdater<RoomSummary, RoomListRoomSummary>(diffCache = diffCache, detectMoves = true) { old, new ->
-        old?.identifier() == new?.identifier()
+        old?.roomId == new?.roomId
     }
 
     fun launchIn(coroutineScope: CoroutineScope) {
@@ -96,12 +96,8 @@ class RoomListDataSource @Inject constructor(
     }
 
     private fun buildAndCacheItem(roomSummaries: List<RoomSummary>, index: Int): RoomListRoomSummary? {
-        val roomListRoomSummary = when (val roomSummary = roomSummaries.getOrNull(index)) {
-            is RoomSummary.Empty -> RoomListRoomSummaryFactory.createPlaceholder(roomSummary.identifier)
-            is RoomSummary.Filled -> roomListRoomSummaryFactory.create(roomSummary)
-            null -> null
-        }
-        diffCache[index] = roomListRoomSummary
-        return roomListRoomSummary
+        val roomListSummary = roomSummaries.getOrNull(index)?.let { roomListRoomSummaryFactory.create(it) }
+        diffCache[index] = roomListSummary
+        return roomListSummary
     }
 }

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/datasource/RoomListRoomSummaryFactory.kt

@@ -20,16 +20,12 @@ import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.model.RoomSummaryDisplayType
 import io.element.android.libraries.core.extensions.orEmpty
 import io.element.android.libraries.dateformatter.api.LastMessageTimestampFormatter
-import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
-import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.roomlist.RoomSummary
-import io.element.android.libraries.matrix.api.roomlist.RoomSummaryDetails
 import io.element.android.libraries.matrix.ui.model.getAvatarData
 import io.element.android.libraries.matrix.ui.model.toInviteSender
-import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
 import javax.inject.Inject
 
@@ -37,37 +33,7 @@ class RoomListRoomSummaryFactory @Inject constructor(
     private val lastMessageTimestampFormatter: LastMessageTimestampFormatter,
     private val roomLastMessageFormatter: RoomLastMessageFormatter,
 ) {
-    companion object {
-        fun createPlaceholder(id: String): RoomListRoomSummary {
-            return RoomListRoomSummary(
-                id = id,
-                roomId = RoomId(id),
-                displayType = RoomSummaryDisplayType.PLACEHOLDER,
-                name = "Short name",
-                timestamp = "hh:mm",
-                lastMessage = "Last message for placeholder",
-                avatarData = AvatarData(id, "S", size = AvatarSize.RoomListItem),
-                numberOfUnreadMessages = 0,
-                numberOfUnreadMentions = 0,
-                numberOfUnreadNotifications = 0,
-                isMarkedUnread = false,
-                userDefinedNotificationMode = null,
-                hasRoomCall = false,
-                isDirect = false,
-                isFavorite = false,
-                inviteSender = null,
-                isDm = false,
-                canonicalAlias = null,
-                heroes = persistentListOf(),
-            )
-        }
-    }
-
-    fun create(roomSummary: RoomSummary.Filled): RoomListRoomSummary {
-        return create(roomSummary.details)
-    }
-
-    private fun create(details: RoomSummaryDetails): RoomListRoomSummary {
+    fun create(details: RoomSummary): RoomListRoomSummary {
         val avatarData = details.getAvatarData(size = AvatarSize.RoomListItem)
         return RoomListRoomSummary(
             id = details.roomId.value,

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchDataSource.kt

@@ -22,7 +22,6 @@ import io.element.android.libraries.core.coroutine.CoroutineDispatchers
 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 io.element.android.libraries.matrix.api.roomlist.loadAllIncrementally
 import kotlinx.collections.immutable.PersistentList
 import kotlinx.collections.immutable.toPersistentList
@@ -48,7 +47,6 @@ class RoomListSearchDataSource @Inject constructor(
     val roomSummaries: Flow<PersistentList<RoomListRoomSummary>> = roomList.filteredSummaries
         .map { roomSummaries ->
             roomSummaries
-                .filterIsInstance<RoomSummary.Filled>()
                 .map(roomSummaryFactory::create)
                 .toPersistentList()
         }

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt

@@ -68,7 +68,7 @@ import io.element.android.libraries.matrix.test.encryption.FakeEncryptionService
 import io.element.android.libraries.matrix.test.notificationsettings.FakeNotificationSettingsService
 import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.matrix.test.room.aRoomInfo
-import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
+import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
@@ -183,7 +183,7 @@ class RoomListPresenterTest {
             roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))
             roomListService.postAllRooms(
                 listOf(
-                    aRoomSummaryFilled(
+                    aRoomSummary(
                         numUnreadMentions = 1,
                         numUnreadMessages = 2,
                     )
@@ -203,48 +203,6 @@ class RoomListPresenterTest {
         }
     }
 
-    @Test
-    fun `present - update visible range`() = runTest {
-        val roomListService = FakeRoomListService()
-        val matrixClient = FakeMatrixClient(
-            roomListService = roomListService
-        )
-        val scope = CoroutineScope(coroutineContext + SupervisorJob())
-        val presenter = createRoomListPresenter(client = matrixClient, coroutineScope = scope)
-        moleculeFlow(RecompositionMode.Immediate) {
-            presenter.present()
-        }.test {
-            roomListService.postAllRooms(listOf(aRoomSummaryFilled()))
-            val loadedState = awaitItem()
-            // check initial value
-            assertThat(roomListService.latestSlidingSyncRange).isNull()
-            // Test empty range
-            loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(1, 0)))
-            assertThat(roomListService.latestSlidingSyncRange).isNull()
-            // Update visible range and check that range is transmitted to the SDK after computation
-            loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(0, 0)))
-            assertThat(roomListService.latestSlidingSyncRange)
-                .isEqualTo(IntRange(0, 20))
-            loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(0, 1)))
-            assertThat(roomListService.latestSlidingSyncRange)
-                .isEqualTo(IntRange(0, 21))
-            loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(19, 29)))
-            assertThat(roomListService.latestSlidingSyncRange)
-                .isEqualTo(IntRange(0, 49))
-            loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(49, 59)))
-            assertThat(roomListService.latestSlidingSyncRange)
-                .isEqualTo(IntRange(29, 79))
-            loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(149, 159)))
-            assertThat(roomListService.latestSlidingSyncRange)
-                .isEqualTo(IntRange(129, 179))
-            loadedState.eventSink.invoke(RoomListEvents.UpdateVisibleRange(IntRange(149, 259)))
-            assertThat(roomListService.latestSlidingSyncRange)
-                .isEqualTo(IntRange(129, 279))
-            cancelAndIgnoreRemainingEvents()
-            scope.cancel()
-        }
-    }
-
     @Test
     fun `present - handle DismissRequestVerificationPrompt`() = runTest {
         val scope = CoroutineScope(context = coroutineContext + SupervisorJob())
@@ -449,7 +407,7 @@ class RoomListPresenterTest {
         val notificationSettingsService = FakeNotificationSettingsService()
         val roomListService = FakeRoomListService()
         roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))
-        roomListService.postAllRooms(listOf(aRoomSummaryFilled(notificationMode = userDefinedMode)))
+        roomListService.postAllRooms(listOf(aRoomSummary(notificationMode = userDefinedMode)))
         val matrixClient = FakeMatrixClient(
             roomListService = roomListService,
             notificationSettingsService = notificationSettingsService
@@ -594,7 +552,7 @@ class RoomListPresenterTest {
         val matrixClient = FakeMatrixClient(
             roomListService = roomListService,
         )
-        val roomSummary = aRoomSummaryFilled(
+        val roomSummary = aRoomSummary(
             currentUserMembership = CurrentUserMembership.INVITED
         )
         roomListService.postAllRoomsLoadingState(RoomList.LoadingState.Loaded(1))
@@ -610,7 +568,7 @@ class RoomListPresenterTest {
             }.last()
 
             val roomListRoomSummary = state.contentAsRooms().summaries.first {
-                it.id == roomSummary.identifier()
+                it.id == roomSummary.roomId.value
             }
             state.eventSink(RoomListEvents.AcceptInvite(roomListRoomSummary))
             state.eventSink(RoomListEvents.DeclineInvite(roomListRoomSummary))

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/search/RoomListSearchPresenterTest.kt

@@ -28,8 +28,7 @@ import io.element.android.libraries.featureflag.api.FeatureFlags
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
 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 io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
+import io.element.android.libraries.matrix.test.room.aRoomSummary
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.tests.testutils.testCoroutineDispatchers
 import kotlinx.coroutines.test.TestScope
@@ -117,10 +116,7 @@ class RoomListSearchPresenterTest {
                 assertThat(state.results).isEmpty()
             }
             roomListService.postAllRooms(
-                listOf(
-                    RoomSummary.Empty("1"),
-                    aRoomSummaryFilled()
-                )
+                listOf(aRoomSummary())
             )
             awaitItem().let { state ->
                 assertThat(state.results).hasSize(1)