diff --git a/CHANGES.md b/CHANGES.md
index 8e9b16b55b..b50eef2dea 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/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
index 11f0ce3d14..cd95bca59e 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 4b6d3de3a2..bfc7ad7f74 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/Riot/Assets/en.lproj/InfoPlist.strings b/Riot/Assets/en.lproj/InfoPlist.strings
index a77ac433c6..4e42de08a8 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/Modules/Room/Attachements/MXKAttachmentsViewController.m b/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m
index 0a9696a571..37759b261e 100644
--- a/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m
+++ b/Riot/Modules/Room/Attachements/MXKAttachmentsViewController.m
@@ -1383,13 +1383,19 @@ - (void)documentInteractionControllerDidDismissOpenInMenu:(UIDocumentInteraction
- (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/Riot/SupportingFiles/Info.plist b/Riot/SupportingFiles/Info.plist
index 4eaf0aa242..5b44a364bb 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