Merge branch 'release/0.26.12/master'

matrix-org · Jun 21, 2023 · 94d8e25 · 94d8e25
2 parents b18527d + 44cca11
commit 94d8e25
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 0.26.12 (2023-06-21)
+
+🐛 Bugfixes
+
+- Ignore push rules with unknown condition kinds ([#7601](https://github.com/vector-im/element-ios/issues/7601))
+
+
 ## Changes in 0.26.11 (2023-06-13)
 
 🙌 Improvements

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

diff --git a/MatrixSDK/MatrixSDKVersion.m b/MatrixSDK/MatrixSDKVersion.m
@@ -16,4 +16,4 @@
 
 #import <Foundation/Foundation.h>
 
-NSString *const MatrixSDKVersion = @"0.26.11";
+NSString *const MatrixSDKVersion = @"0.26.12";
diff --git a/MatrixSDK/NotificationCenter/MXNotificationCenter.m b/MatrixSDK/NotificationCenter/MXNotificationCenter.m
@@ -207,6 +207,7 @@ - (MXPushRule *)ruleMatchingEvent:(MXEvent *)event roomState:(MXRoomState*)roomS
  {
  MXLogDebug(@"[MXNotificationCenter] Warning: There is no MXPushRuleConditionChecker to check condition of kind: %@", condition.kind);
  conditionsOk = NO;
+ break; // Don't go further as we cannot guarantee that this rule matches
  }
  }
  break;