From 34ddefaac01f49e01ee8e69d31db4378c1ae1e13 Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 12 Nov 2024 13:43:18 +0100 Subject: [PATCH 1/4] Prepare for new sprint --- Config/AppVersion.xcconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 29905a7a2d..16b10d8d8c 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.11.20 -CURRENT_PROJECT_VERSION = 1.11.20 +MARKETING_VERSION = 1.11.21 +CURRENT_PROJECT_VERSION = 1.11.21 From 7e509fbbcd0a40ba4232bad3b0dea52c27c41844 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Thu, 14 Nov 2024 08:37:35 +0000 Subject: [PATCH 2/4] Fix a bug where Matrix RTC call notifications are removed immediately after display. (#7870) --- RiotNSE/NotificationService.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RiotNSE/NotificationService.swift b/RiotNSE/NotificationService.swift index 21b05588bd..5c8a4e05fa 100644 --- a/RiotNSE/NotificationService.swift +++ b/RiotNSE/NotificationService.swift @@ -795,7 +795,7 @@ class NotificationService: UNNotificationServiceExtension { return Constants.callInviteNotificationCategoryIdentifier } - guard event.eventType == .roomMessage || event.eventType == .roomEncrypted else { + guard event.eventType == .roomMessage || event.eventType == .roomEncrypted || event.eventType == .callNotify else { return Constants.toBeRemovedNotificationCategoryIdentifier } From e7567f6b621bce67df590356d3257a48583723f6 Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 14 Nov 2024 14:47:06 +0000 Subject: [PATCH 3/4] version++ --- CHANGES.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 4668b1004b..698e941e66 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +## Changes in 1.11.21 (2024-11-14) + +No significant changes. + + ## Changes in 1.11.20 (2024-11-12) No significant changes. From a21546e7489063c5f191033d494cf038f1faadc1 Mon Sep 17 00:00:00 2001 From: Doug Date: Thu, 14 Nov 2024 15:27:59 +0000 Subject: [PATCH 4/4] finish version++