Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add comments.

Browse source
This commit is contained in:
Doug 2021-09-06 18:15:55 +01:00
parent aae43e8954
commit 46b79bec45
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Riot/Modules/Room/RoomViewController.m
View file

@ -6113,11 +6113,13 @@ 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;
@ -6151,11 +6153,13 @@ 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;
@ -6183,11 +6187,13 @@ 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;