felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 09:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Doug
2022-03-31 10:39:25 +01:00
parent 2bd81a09e1 38051ec88b
commit 1ee5c90e7f
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+3 -2
View File
@@ -7142,7 +7142,7 @@ static CGSize kThreadListBarButtonItemImageSize;
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;
@@ -7150,8 +7150,9 @@ static CGSize kThreadListBarButtonItemImageSize;
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];
}