From 9ed48a58e77184f81dc9b609bcacf915c0886364 Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 10 Aug 2022 11:48:00 +0100 Subject: [PATCH 1/4] Fix potential crash when dismissing an image. --- .../Room/Attachements/MXKAttachmentsViewController.m | 8 +++++++- changelog.d/6548.bugfix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 changelog.d/6548.bugfix diff --git a/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m b/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m index 0a9696a57..37759b261 100644 --- a/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m +++ b/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m @@ -1383,13 +1383,19 @@ - (BOOL)prepareSubviewsForTransition:(BOOL)isStartInteraction { - MXKMediaCollectionViewCell *cell = (MXKMediaCollectionViewCell *)[self.attachmentsCollection.visibleCells firstObject]; + // Sanity check + if (currentVisibleItemIndex >= attachments.count) + { + return NO; + } + MXKAttachment *attachment = attachments[currentVisibleItemIndex]; NSString *mimeType = attachment.contentInfo[@"mimetype"]; // Check attachment type for GIFs - this is required because of the extra WKWebView if (attachment.type == MXKAttachmentTypeImage && attachment.contentURL && [mimeType isEqualToString:@"image/gif"]) { + MXKMediaCollectionViewCell *cell = (MXKMediaCollectionViewCell *)[self.attachmentsCollection.visibleCells firstObject]; UIView *customView = cell.customView; for (UIView *v in customView.subviews) { diff --git a/changelog.d/6548.bugfix b/changelog.d/6548.bugfix new file mode 100644 index 000000000..3c2f6424c --- /dev/null +++ b/changelog.d/6548.bugfix @@ -0,0 +1 @@ +Media: Fix a potential crash when dismissing an image. From d6eda021f6d80fa29f351c4fdef12da5ab176a9f Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 10 Aug 2022 11:55:12 +0100 Subject: [PATCH 2/4] Update the contacts permission string. --- Riot/Assets/en.lproj/InfoPlist.strings | 2 +- Riot/SupportingFiles/Info.plist | 2 +- changelog.d/6549.misc | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/6549.misc diff --git a/Riot/Assets/en.lproj/InfoPlist.strings b/Riot/Assets/en.lproj/InfoPlist.strings index a77ac433c..4e42de08a 100644 --- a/Riot/Assets/en.lproj/InfoPlist.strings +++ b/Riot/Assets/en.lproj/InfoPlist.strings @@ -18,7 +18,7 @@ "NSCameraUsageDescription" = "The camera is used to take photos and videos, make video calls."; "NSPhotoLibraryUsageDescription" = "The photo library is used to send photos and videos."; "NSMicrophoneUsageDescription" = "Element needs to access your microphone to make and receive calls, take videos, and record voice messages."; -"NSContactsUsageDescription" = "Element will show your contacts so you can invite them to chat."; +"NSContactsUsageDescription" = "Element will check your contacts with your identity server to find who is on Matrix."; "NSCalendarsUsageDescription" = "See your scheduled meetings in the app."; "NSFaceIDUsageDescription" = "Face ID is used to access your app."; "NSLocationWhenInUseUsageDescription" = "When you share your location to people, Element needs access to show them a map."; diff --git a/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist index 4eaf0aa24..5b44a364b 100644 --- a/Riot/SupportingFiles/Info.plist +++ b/Riot/SupportingFiles/Info.plist @@ -73,7 +73,7 @@ NSCameraUsageDescription The camera is used to take photos and videos, make video calls. NSContactsUsageDescription - The contact book is used to send room invitation to your contacts with their emails. + Element will check your contacts with your identity server to find who is on Matrix. NSFaceIDUsageDescription Face ID is used to access your app. NSLocationAlwaysAndWhenInUseUsageDescription diff --git a/changelog.d/6549.misc b/changelog.d/6549.misc new file mode 100644 index 000000000..fc3c93795 --- /dev/null +++ b/changelog.d/6549.misc @@ -0,0 +1 @@ +Contacts Prompt: Clarify how contacts are used in the app. From ae7fa65c0c5aadd0af950e6f3ca7381eb8ada08c Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 10 Aug 2022 15:23:09 +0100 Subject: [PATCH 3/4] changelog.d: Upgrade MatrixSDK version ([v0.23.15](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.15)). --- Config/AppVersion.xcconfig | 4 ++-- Podfile | 2 +- changelog.d/x-nolink-0.change | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog.d/x-nolink-0.change diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig index 11f0ce3d1..cd95bca59 100644 --- a/Config/AppVersion.xcconfig +++ b/Config/AppVersion.xcconfig @@ -15,5 +15,5 @@ // // Version -MARKETING_VERSION = 1.8.25 -CURRENT_PROJECT_VERSION = 1.8.25 +MARKETING_VERSION = 1.8.26 +CURRENT_PROJECT_VERSION = 1.8.26 diff --git a/Podfile b/Podfile index 4b6d3de3a..bfc7ad7f7 100644 --- a/Podfile +++ b/Podfile @@ -16,7 +16,7 @@ use_frameworks! # - `{ :specHash => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for MatrixSDK repo. Used by Fastfile during CI # # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it -$matrixSDKVersion = '= 0.23.14' +$matrixSDKVersion = '= 0.23.15' # $matrixSDKVersion = :local # $matrixSDKVersion = { :branch => 'develop'} # $matrixSDKVersion = { :specHash => { git: 'https://git.io/fork123', branch: 'fix' } } diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change new file mode 100644 index 000000000..c9d26b9c9 --- /dev/null +++ b/changelog.d/x-nolink-0.change @@ -0,0 +1 @@ +Upgrade MatrixSDK version ([v0.23.15](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.15)). \ No newline at end of file From f3c9157cda2b3d0d7b1daca8d6571611db9dcc0a Mon Sep 17 00:00:00 2001 From: Doug Date: Wed, 10 Aug 2022 15:23:10 +0100 Subject: [PATCH 4/4] version++ --- CHANGES.md | 15 +++++++++++++++ changelog.d/6548.bugfix | 1 - changelog.d/6549.misc | 1 - changelog.d/x-nolink-0.change | 1 - 4 files changed, 15 insertions(+), 3 deletions(-) delete mode 100644 changelog.d/6548.bugfix delete mode 100644 changelog.d/6549.misc delete mode 100644 changelog.d/x-nolink-0.change diff --git a/CHANGES.md b/CHANGES.md index 8e9b16b55..b50eef2de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,18 @@ +## Changes in 1.8.26 (2022-08-10) + +🙌 Improvements + +- Upgrade MatrixSDK version ([v0.23.15](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.15)). + +🐛 Bugfixes + +- Media: Fix a potential crash when dismissing an image. ([#6548](https://github.com/vector-im/element-ios/issues/6548)) + +Others + +- Contacts Prompt: Clarify how contacts are used in the app. ([#6549](https://github.com/vector-im/element-ios/issues/6549)) + + ## Changes in 1.8.25 (2022-08-09) 🙌 Improvements diff --git a/changelog.d/6548.bugfix b/changelog.d/6548.bugfix deleted file mode 100644 index 3c2f6424c..000000000 --- a/changelog.d/6548.bugfix +++ /dev/null @@ -1 +0,0 @@ -Media: Fix a potential crash when dismissing an image. diff --git a/changelog.d/6549.misc b/changelog.d/6549.misc deleted file mode 100644 index fc3c93795..000000000 --- a/changelog.d/6549.misc +++ /dev/null @@ -1 +0,0 @@ -Contacts Prompt: Clarify how contacts are used in the app. diff --git a/changelog.d/x-nolink-0.change b/changelog.d/x-nolink-0.change deleted file mode 100644 index c9d26b9c9..000000000 --- a/changelog.d/x-nolink-0.change +++ /dev/null @@ -1 +0,0 @@ -Upgrade MatrixSDK version ([v0.23.15](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.15)). \ No newline at end of file