From 1ba8d29333bce727dd6e54846ce949459914c4a3 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Thu, 28 Jul 2022 10:10:01 +0100 Subject: [PATCH] fixing rooms from other spaces being included in home due to wrong filter param - we were passing null which meant no filter was being applied --- .../app/features/home/room/list/RoomListSectionBuilder.kt | 4 ++-- .../app/features/home/room/list/home/HomeRoomListViewModel.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt index f929366a5e..46591a0ca6 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilder.kt @@ -378,7 +378,7 @@ class RoomListSectionBuilder( activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater { override fun updateForSpaceId(roomId: String?) { filteredPagedRoomSummariesLive.queryParams = roomQueryParams.copy( - spaceFilter = roomId?.toActiveSpaceOrOrphanRooms() + spaceFilter = roomId.toActiveSpaceOrOrphanRooms() ) liveQueryParams.update { filteredPagedRoomSummariesLive.queryParams } } @@ -444,7 +444,7 @@ class RoomListSectionBuilder( return when (spaceFilter) { RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL -> { copy( - spaceFilter = currentSpace?.toActiveSpaceOrOrphanRooms() + spaceFilter = currentSpace.toActiveSpaceOrOrphanRooms() ) } RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL -> { diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt index 3226ed24f2..55d955cb37 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListViewModel.kt @@ -124,7 +124,7 @@ class HomeRoomListViewModel @AssistedInject constructor( private fun getSpaceFilter(selectedSpaceId: String?, strategy: RoomListViewModel.SpaceFilterStrategy): SpaceFilter? { return when (strategy) { RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL -> { - selectedSpaceId?.toActiveSpaceOrOrphanRooms() + selectedSpaceId.toActiveSpaceOrOrphanRooms() } RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL -> { selectedSpaceId?.let { SpaceFilter.ActiveSpace(it) }