Merge branch 'release/1.8.10/master'

element-hq · Mar 31, 2022 · 9735459 · 9735459
2 parents 751fe14 + 8524fdf
commit 9735459
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+## Changes in 1.8.10 (2022-03-31)
+
+🐛 Bugfixes
+
+- Message Composer: Fix a crash when sending a photo using the camera. ([#5951](https://github.com/vector-im/element-ios/issues/5951))
+
+
 ## Changes in 1.8.9 (2022-03-28)
 
 🙌 Improvements

diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.8.9
-CURRENT_PROJECT_VERSION = 1.8.9
+MARKETING_VERSION = 1.8.10
+CURRENT_PROJECT_VERSION = 1.8.10
diff --git a/Podfile.lock b/Podfile.lock
@@ -227,4 +227,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 820f04e07aa252459ecfa88d04da729daca4fcbb
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.11.2
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
@@ -7154,16 +7154,17 @@ - (void)cameraPresenterDidCancel:(CameraPresenter *)cameraPresenter
     self.cameraPresenter = nil;
 }
 
-- (void)cameraPresenter:(CameraPresenter *)cameraPresenter didSelectImageData:(NSData *)imageData withUTI:(MXKUTI *)uti
+- (void)cameraPresenter:(CameraPresenter *)cameraPresenter didSelectImage:(UIImage *)image
 {
     [cameraPresenter dismissWithAnimated:YES completion:nil];
     self.cameraPresenter = nil;
 
     RoomInputToolbarView *roomInputToolbarView = [self inputToolbarViewAsRoomInputToolbarView];
     if (roomInputToolbarView)
     {
+        NSData *imageData = UIImageJPEGRepresentation(image, 1.0);
         [roomInputToolbarView sendSelectedImage:imageData
-                                   withMimeType:uti.mimeType
+                                   withMimeType:MXKUTI.jpeg.mimeType
                              andCompressionMode:MediaCompressionHelper.defaultCompressionMode
                             isPhotoLibraryAsset:NO];
     }