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

Send original data when when the compression prompt is disabled.

Browse Source 
Rebase changes on develop.
This commit is contained in:
Doug
2021-10-28 11:26:34 +01:00
parent 68a9923633
commit f4da303bd8
2 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
RiotShareExtension/Shared/ShareManager.m
View File

@@ -314,30 +314,41 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
if ([self.shareItemProvider areAllItemsImages])
{
// When all items are images, they're processed together from the
// pending list, immediately after the final image has been loaded.
[self.pendingImages addObject:imageData];
}
else
{
CGSize imageSize = [self imageSizeFromImageData:imageData];
// Otherwise, the image is sent as is, without prompting for a resize
// as that wouldn't make much sense with multiple content types.
self.imageCompressionMode = ImageCompressionModeNone;
self.actualLargeSize = MAX(imageSize.width, imageSize.height);
[self sendImageData:imageData toRooms:rooms success:requestSuccess failure:requestFailure];
}
// Only prompt for image resize if all items are images
// Ignore showMediaCompressionPrompt setting due to memory constraints with full size images.
// When there are multiple content types the image will have been sent above.
// Otherwise, if we have loaded all of the images we can send them all together.
if ([self.shareItemProvider areAllItemsImages])
{
if ([self.shareItemProvider areAllItemsLoaded])
{
UIAlertController *compressionPrompt = [self compressionPromptForPendingImagesWithShareBlock:^{
void (^sendPendingImages)(void) = ^void() {
[self sendImageDatas:self.pendingImages.copy toRooms:rooms success:requestSuccess failure:requestFailure];
}];
};
if (compressionPrompt)
if (RiotSettings.shared.showMediaCompressionPrompt)
{
[self presentCompressionPrompt:compressionPrompt];
// Create a compression prompt which will be nil when the sizes can't be determined or if there are no pending images.
UIAlertController *compressionPrompt = [self compressionPromptForPendingImagesWithShareBlock:sendPendingImages];
if (compressionPrompt)
{
[self presentCompressionPrompt:compressionPrompt];
}
}
else
{
self.imageCompressionMode = ImageCompressionModeNone;
sendPendingImages();
}
}
else
@@ -1021,17 +1032,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
break;
}
if (CGSizeEqualToSize(newImageSize, CGSizeZero))
{
// No resize to make
// Make sure the uploaded image orientation is up
if ([self isImageOrientationNotUpOrUndeterminedForImageData:imageData])
{
UIImage *image = [UIImage imageWithData:imageData];
convertedImage = [MXKTools forceImageOrientationUp:image];
}
}
else
if (!CGSizeEqualToSize(newImageSize, CGSizeZero))
{
// Resize the image and set image in right orientation too
convertedImage = [MXKTools resizeImageWithData:imageData toFitInSize:newImageSize];

1
changelog.d/4815.change Normal file
View File

@@ -0,0 +1 @@
Share Extension: Remove the image compression prompt when the showMediaSizeSelection setting is disabled.