From 190a425aa6aa068c3405cd88a3a2e564f24100e6 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Thu, 7 Apr 2022 14:22:13 +0200
Subject: [PATCH 1/4] don't leave DMs when leaving all rooms in space

---
 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 00000000000..001b4bf400c
--- /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 9b95b5328f7..cf3d01681b3 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 {

From 4a2b573ef4a0dc9e044376911028f2980ce4fbc3 Mon Sep 17 00:00:00 2001
From: NIkita Fedrunov <fedrunov@element.io>
Date: Thu, 7 Apr 2022 14:22:13 +0200
Subject: [PATCH 2/4] Towncrier

---
 CHANGES.md              | 8 ++++++++
 changelog.d/5609.bugfix | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)
 delete mode 100644 changelog.d/5609.bugfix

diff --git a/CHANGES.md b/CHANGES.md
index 16202e60b87..47b8c570411 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,11 @@
+Changes in Element v1.4.11 (2022-04-07)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore ([#5609](https://github.com/vector-im/element-android/issues/5609))
+
+
 Changes in Element v1.4.10 (2022-04-05)
 =======================================
 
diff --git a/changelog.d/5609.bugfix b/changelog.d/5609.bugfix
deleted file mode 100644
index 001b4bf400c..00000000000
--- a/changelog.d/5609.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Choosing "leave all rooms and spaces" while leaving Space won't cause leaving DMs in this Space anymore
\ No newline at end of file

From 0e1c587effb4ea329e4ff46c876f951ccdd89cc8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 7 Apr 2022 17:58:25 +0200
Subject: [PATCH 3/4] Version 1.4.11

---
 matrix-sdk-android/build.gradle | 2 +-
 vector/build.gradle             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/build.gradle b/matrix-sdk-android/build.gradle
index 748bae8ff20..788fdaff551 100644
--- a/matrix-sdk-android/build.gradle
+++ b/matrix-sdk-android/build.gradle
@@ -31,7 +31,7 @@ android {
         // that the app's state is completely cleared between tests.
         testInstrumentationRunnerArguments clearPackageData: 'true'
 
-        buildConfigField "String", "SDK_VERSION", "\"1.4.10\""
+        buildConfigField "String", "SDK_VERSION", "\"1.4.11\""
 
         buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
         buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
diff --git a/vector/build.gradle b/vector/build.gradle
index a7e347949b0..e222012c49d 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -18,7 +18,7 @@ ext.versionMinor = 4
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-ext.versionPatch = 10
+ext.versionPatch = 11
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

From c2bdfe0f199cc0c8e4259da258859621b3f32c9a Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 7 Apr 2022 17:59:03 +0200
Subject: [PATCH 4/4] Fastlane

---
 fastlane/metadata/android/en-US/changelogs/40104110.txt | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40104110.txt

diff --git a/fastlane/metadata/android/en-US/changelogs/40104110.txt b/fastlane/metadata/android/en-US/changelogs/40104110.txt
new file mode 100644
index 00000000000..217bbe0b392
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40104110.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Various bug fixes and stability improvements.
+Full changelog: https://github.com/vector-im/element-android/releases
\ No newline at end of file