Merge branch 'master' into develop

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

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' } }

Podfile.lock

@@ -56,9 +56,9 @@ PODS:
   - LoggerAPI (1.9.200):
     - Logging (~> 1.1)
   - Logging (1.4.0)
-  - MatrixSDK (0.23.14):
-    - MatrixSDK/Core (= 0.23.14)
-  - MatrixSDK/Core (0.23.14):
+  - MatrixSDK (0.23.15):
+    - MatrixSDK/Core (= 0.23.15)
+  - MatrixSDK/Core (0.23.15):
     - AFNetworking (~> 4.0.0)
     - GZIP (~> 1.3.0)
     - libbase58 (~> 0.1.4)
@@ -66,9 +66,9 @@ PODS:
     - OLMKit (~> 3.2.5)
     - Realm (= 10.27.0)
     - SwiftyBeaver (= 1.9.5)
-  - MatrixSDK/CryptoSDK (0.23.14):
+  - MatrixSDK/CryptoSDK (0.23.15):
     - MatrixSDKCrypto (= 0.1.0)
-  - MatrixSDK/JingleCallStack (0.23.14):
+  - MatrixSDK/JingleCallStack (0.23.15):
     - JitsiMeetSDK (= 5.0.2)
     - MatrixSDK/Core
   - MatrixSDKCrypto (0.1.0)
@@ -123,8 +123,8 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.2)
   - KTCenterFlowLayout (~> 1.3.1)
   - libPhoneNumber-iOS (~> 0.9.13)
-  - MatrixSDK (= 0.23.14)
-  - MatrixSDK/JingleCallStack (= 0.23.14)
+  - MatrixSDK (= 0.23.15)
+  - MatrixSDK/JingleCallStack (= 0.23.15)
   - OLMKit
   - PostHog (~> 1.4.4)
   - ReadMoreTextView (~> 3.0.1)
@@ -221,7 +221,7 @@ SPEC CHECKSUMS:
   libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
   LoggerAPI: ad9c4a6f1e32f518fdb43a1347ac14d765ab5e3d
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
-  MatrixSDK: a62f8aafa25623f261599fdc2e734043da548440
+  MatrixSDK: 9ed379b45f6809fc573db53a30a4d09f960e5886
   MatrixSDKCrypto: 4b9146d5ef484550341be056a164c6930038028e
   OLMKit: 9fb4799c4a044dd2c06bda31ec31a12191ad30b5
   PostHog: 4b6321b521569092d4ef3a02238d9435dbaeb99f
@@ -241,6 +241,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 010dde83f230d559fc7987ccdbb0f0069418a319
+PODFILE CHECKSUM: 044b4d9f0d9485e1407019fb3c7b267458120a89
 
 COCOAPODS: 1.11.2

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.";

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)
         {

Riot/SupportingFiles/Info.plist

@@ -73,7 +73,7 @@
 	<key>NSCameraUsageDescription</key>
 	<string>The camera is used to take photos and videos, make video calls.</string>
 	<key>NSContactsUsageDescription</key>
-	<string>The contact book is used to send room invitation to your contacts with their emails.</string>
+	<string>Element will check your contacts with your identity server to find who is on Matrix.</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Face ID is used to access your app.</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>