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

Add MediaCompressionHelper.defaultCompressionMode for use in RoomViewController.

Browse Source
This commit is contained in:
Doug
2021-09-07 14:46:02 +01:00
parent f2da5aa470
commit e04bbb776d
2 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/RoomViewController.m
+9 -36
View File
@@ -6113,18 +6113,10 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
RoomInputToolbarView *roomInputToolbarView = [self inputToolbarViewAsRoomInputToolbarView];
if (roomInputToolbarView)
{
// When the compression mode build setting hasn't been customised, use the media compression prompt setting to determine what to do.
MXKRoomInputToolbarCompressionMode compressionMode;
if (BuildSettings.roomInputToolbarCompressionMode == MXKRoomInputToolbarCompressionModePrompt)
{
compressionMode = RiotSettings.shared.showMediaCompressionPrompt ? MXKRoomInputToolbarCompressionModePrompt : MXKRoomInputToolbarCompressionModeNone;
}
// Otherwise use the compression mode defined in the build settings.
else
{
compressionMode = BuildSettings.roomInputToolbarCompressionMode;
}
[roomInputToolbarView sendSelectedImage:imageData withMimeType:uti.mimeType andCompressionMode:compressionMode isPhotoLibraryAsset:NO];
[roomInputToolbarView sendSelectedImage:imageData
withMimeType:uti.mimeType
andCompressionMode:MediaCompressionHelper.defaultCompressionMode
isPhotoLibraryAsset:NO];
}
}
@@ -6153,18 +6145,10 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
RoomInputToolbarView *roomInputToolbarView = [self inputToolbarViewAsRoomInputToolbarView];
if (roomInputToolbarView)
{
// When the compression mode build setting hasn't been customised, use the media compression prompt setting to determine what to do.
MXKRoomInputToolbarCompressionMode compressionMode;
if (BuildSettings.roomInputToolbarCompressionMode == MXKRoomInputToolbarCompressionModePrompt)
{
compressionMode = RiotSettings.shared.showMediaCompressionPrompt ? MXKRoomInputToolbarCompressionModePrompt : MXKRoomInputToolbarCompressionModeNone;
}
// Otherwise use the compression mode defined in the build settings.
else
{
compressionMode = BuildSettings.roomInputToolbarCompressionMode;
}
[roomInputToolbarView sendSelectedImage:imageData withMimeType:uti.mimeType andCompressionMode:compressionMode isPhotoLibraryAsset:YES];
[roomInputToolbarView sendSelectedImage:imageData
withMimeType:uti.mimeType
andCompressionMode:MediaCompressionHelper.defaultCompressionMode
isPhotoLibraryAsset:YES];
}
}
@@ -6187,18 +6171,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
// Set a 1080p video conversion preset as compression mode only has an effect on the images.
[MXSDKOptions sharedInstance].videoConversionPresetName = AVAssetExportPreset1920x1080;
// When the compression mode build setting hasn't been customised, use the media compression prompt setting to determine what to do.
MXKRoomInputToolbarCompressionMode compressionMode;
if (BuildSettings.roomInputToolbarCompressionMode == MXKRoomInputToolbarCompressionModePrompt)
{
compressionMode = RiotSettings.shared.showMediaCompressionPrompt ? MXKRoomInputToolbarCompressionModePrompt : MXKRoomInputToolbarCompressionModeNone;
}
// Otherwise use the compression mode defined in the build settings.
else
{
compressionMode = BuildSettings.roomInputToolbarCompressionMode;
}
[roomInputToolbarView sendSelectedAssets:assets withCompressionMode:compressionMode];
[roomInputToolbarView sendSelectedAssets:assets withCompressionMode:MediaCompressionHelper.defaultCompressionMode];
}
}