From eab3e5aefa11fd07a91c60fd61219e2e0bec5da9 Mon Sep 17 00:00:00 2001
From: fedrunov <66663241+fedrunov@users.noreply.github.com>
Date: Thu, 7 Apr 2022 15:16:12 +0200
Subject: [PATCH] don't leave DMs when leaving all rooms in space (#5720)

---
 changelog.d/5609.bugfix                                         | 1 +
 .../java/im/vector/app/features/spaces/SpaceMenuViewModel.kt    | 2 ++
 2 files changed, 3 insertions(+)
 create mode 100644 changelog.d/5609.bugfix

diff --git a/changelog.d/5609.bugfix b/changelog.d/5609.bugfix
new file mode 100644
index 0000000000..001b4bf400
--- /dev/null
+++ b/changelog.d/5609.bugfix
@@ -0,0 +1 @@
+Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
index 9b95b5328f..cf3d01681b 100644
--- a/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/spaces/SpaceMenuViewModel.kt
@@ -35,6 +35,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.matrix.android.sdk.api.query.ActiveSpaceFilter
+import org.matrix.android.sdk.api.query.RoomCategoryFilter
 import org.matrix.android.sdk.api.session.Session
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.room.model.Membership
@@ -140,6 +141,7 @@ class SpaceMenuViewModel @AssistedInject constructor(
                                 excludeType = null
                                 activeSpaceFilter = ActiveSpaceFilter.ActiveSpace(initialState.spaceId)
                                 memberships = listOf(Membership.JOIN)
+                                roomCategoryFilter = RoomCategoryFilter.ONLY_ROOMS
                             }
                     ).forEach {
                         try {