From 822095fc29093ad0aa5e2dd48ff5b3c71183aef4 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 13 Jun 2023 13:11:56 +0200 Subject: [PATCH 1/4] Prepare for new sprint From 800ba8825db3c92f20449315fe03490360ff2cf8 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Wed, 21 Jun 2023 09:28:35 +0200 Subject: [PATCH 2/4] Ignore push rules with unknown condition kinds Fixes: vector-im/element-ios#7601 --- MatrixSDK/NotificationCenter/MXNotificationCenter.m | 1 + changelog.d/7601.bugfix | 1 + 2 files changed, 2 insertions(+) create mode 100644 changelog.d/7601.bugfix diff --git a/MatrixSDK/NotificationCenter/MXNotificationCenter.m b/MatrixSDK/NotificationCenter/MXNotificationCenter.m index d153739827..d449ed0325 100644 --- 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; diff --git a/changelog.d/7601.bugfix b/changelog.d/7601.bugfix new file mode 100644 index 0000000000..512b9be99e --- /dev/null +++ b/changelog.d/7601.bugfix @@ -0,0 +1 @@ +Ignore push rules with unknown condition kinds From 447e02fdd78205d8e074c37daa6ecd360e8abaa3 Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 21 Jun 2023 10:16:15 +0100 Subject: [PATCH 3/4] version++ --- CHANGES.md | 7 +++++++ MatrixSDK.podspec | 2 +- MatrixSDK/MatrixSDKVersion.m | 2 +- changelog.d/7601.bugfix | 1 - 4 files changed, 9 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/7601.bugfix diff --git a/CHANGES.md b/CHANGES.md index c7ccdb292b..95bce770bb 100644 --- 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 index 50b4103a08..56035020ba 100644 --- 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 index 61a1ca0b24..59da0f2626 100644 --- a/MatrixSDK/MatrixSDKVersion.m +++ b/MatrixSDK/MatrixSDKVersion.m @@ -16,4 +16,4 @@ #import -NSString *const MatrixSDKVersion = @"0.26.11"; +NSString *const MatrixSDKVersion = @"0.26.12"; diff --git a/changelog.d/7601.bugfix b/changelog.d/7601.bugfix deleted file mode 100644 index 512b9be99e..0000000000 --- a/changelog.d/7601.bugfix +++ /dev/null @@ -1 +0,0 @@ -Ignore push rules with unknown condition kinds From 44cca113b2fb4c95ad88d5fb1231d7fe0413aadf Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 21 Jun 2023 11:32:22 +0100 Subject: [PATCH 4/4] finish version++