From 366e0d985f0a7d401c4f714c9263d2a6d7e820d1 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Fri, 10 Jun 2022 11:35:19 +0200
Subject: [PATCH] Fix space orphan filtering

---
 changelog.d/6272.bugfix                                       | 1 +
 .../java/im/vector/app/features/home/HomeDetailViewModel.kt   | 4 ++--
 .../features/home/room/list/RoomListSectionBuilderSpace.kt    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 changelog.d/6272.bugfix

diff --git a/changelog.d/6272.bugfix b/changelog.d/6272.bugfix
new file mode 100644
index 0000000000..beea9e0b23
--- /dev/null
+++ b/changelog.d/6272.bugfix
@@ -0,0 +1 @@
+Fix: All rooms are shown in Home regardless of the switch state.
diff --git a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
index 7aa121e6cc..485d1e33ec 100644
--- a/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
@@ -289,7 +289,7 @@ class HomeDetailViewModel @AssistedInject constructor(
                 .launchIn(viewModelScope)
     }
 
-    private fun RoomGroupingMethod.BySpace.toActiveSpaceOrOrphanRooms(): SpaceFilter? {
-        return spaceSummary?.roomId?.toActiveSpaceOrOrphanRooms()
+    private fun RoomGroupingMethod.BySpace.toActiveSpaceOrOrphanRooms(): SpaceFilter {
+        return spaceSummary?.roomId.toActiveSpaceOrOrphanRooms()
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
index 171b05637a..47a1df3ed0 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
@@ -379,7 +379,7 @@ class RoomListSectionBuilderSpace(
                     activeSpaceUpdaters.add(object : RoomListViewModel.ActiveSpaceQueryUpdater {
                         override fun updateForSpaceId(roomId: String?) {
                             filteredPagedRoomSummariesLive.queryParams = roomQueryParams.copy(
-                                    spaceFilter = roomId?.toActiveSpaceOrOrphanRooms()
+                                    spaceFilter = roomId.toActiveSpaceOrOrphanRooms()
                             )
                             liveQueryParams.update { filteredPagedRoomSummariesLive.queryParams }
                         }
@@ -445,7 +445,7 @@ class RoomListSectionBuilderSpace(
         return when (spaceFilter) {
             RoomListViewModel.SpaceFilterStrategy.ORPHANS_IF_SPACE_NULL -> {
                 copy(
-                        spaceFilter = currentSpace?.toActiveSpaceOrOrphanRooms()
+                        spaceFilter = currentSpace.toActiveSpaceOrOrphanRooms()
                 )
             }
             RoomListViewModel.SpaceFilterStrategy.ALL_IF_SPACE_NULL -> {