Merge branch 'release/0.20.9/master'

matrix-org · Oct 21, 2021 · df04dab · df04dab
2 parents 5c751ec + 530fab7
commit df04dab
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 0.20.9 (2021-10-21)
+
+🐛 Bugfixes
+
+- MXRoomListDataFilterOptions: Fix predicate for orphaned rooms. ([#5031](https://github.com/vector-im/element-ios/issues/5031))
+
+
 ## Changes in 0.20.8 (2021-10-20)
 
 🙌 Improvements

diff --git a/MatrixSDK.podspec b/MatrixSDK.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "MatrixSDK"
-  s.version      = "0.20.8"
+  s.version      = "0.20.9"
   s.summary      = "The iOS SDK to build apps compatible with Matrix (https://www.matrix.org)"
 
   s.description  = <<-DESC

diff --git a/MatrixSDK/Data/RoomList/MXRoomListDataFilterOptions.swift b/MatrixSDK/Data/RoomList/MXRoomListDataFilterOptions.swift
@@ -156,8 +156,12 @@ public final class MXRoomListDataFilterOptions: NSObject {
                 let subpredicate3 = NSPredicate(format: "(%K & %d) != 0",
                                                 #keyPath(MXRoomSummaryProtocol.dataTypes), favoritedDataTypes.rawValue)
 
-                let subpredicate4 = NSPredicate(format: "%K.@count == 0",
+                let subpredicate4_1 = NSPredicate(format: "%K == NULL",
                                                 #keyPath(MXRoomSummaryProtocol.parentSpaceIds))
+                let subpredicate4_2 = NSPredicate(format: "%K.@count == 0",
+                                                #keyPath(MXRoomSummaryProtocol.parentSpaceIds))
+                let subpredicate4 = NSCompoundPredicate(type: .or,
+                                                        subpredicates: [subpredicate4_1, subpredicate4_2])
 
                 let subpredicate = NSCompoundPredicate(type: .or,
                                                        subpredicates: [subpredicate1, subpredicate2, subpredicate3, subpredicate4])

diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.20.8";
+NSString *const MatrixSDKVersion = @"0.20.9";