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

Merge pull request #2342 from vector-im/share_extension_limit_large_size_images

Browse source 
Share extension: Remove image large size resizing choice if output dimension is too high to prevent memory limit exception
This commit is contained in:
SBiOSoftWhare 2019-03-21 13:30:04 +01:00 committed by GitHub
commit b2a9ffe03b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.rst
View file

@ -2,6 +2,7 @@ Changes in 0.8.4 (2019-03-xx)
=============================================== ===============================================
Improvements: Improvements:
* Share extension: Remove image large size resizing choice if output dimension is too high to prevent memory limit exception (PR #2342).
Bug fix: Bug fix:

6
RiotShareExtension/Managers/ShareExtensionManager.m
View file

@ -23,6 +23,8 @@
NSString *const kShareExtensionManagerDidUpdateAccountDataNotification = @"kShareExtensionManagerDidUpdateAccountDataNotification"; NSString *const kShareExtensionManagerDidUpdateAccountDataNotification = @"kShareExtensionManagerDidUpdateAccountDataNotification";
static const CGFloat kLargeImageSizeMaxDimension = 2048.0;
typedef NS_ENUM(NSInteger, ImageCompressionMode) typedef NS_ENUM(NSInteger, ImageCompressionMode)
{ {
ImageCompressionModeNone, ImageCompressionModeNone,
@ -560,7 +562,9 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
}]]; }]];
} }
if (compressionSizes.large.fileSize) // Do not offer the possibility to resize an image with a dimension above kLargeImageSizeMaxDimension, to prevent the risk of memory limit exception.
// TODO: Remove this condition when issue https://github.com/vector-im/riot-ios/issues/2341 will be fixed.
if (compressionSizes.large.fileSize && (MAX(compressionSizes.large.imageSize.width, compressionSizes.large.imageSize.height) <= kLargeImageSizeMaxDimension))
{ {
NSString *resolution = [NSString stringWithFormat:@"%@ (%d x %d)", [MXTools fileSizeToString:compressionSizes.large.fileSize round:NO], (int)compressionSizes.large.imageSize.width, (int)compressionSizes.large.imageSize.height]; NSString *resolution = [NSString stringWithFormat:@"%@ (%d x %d)", [MXTools fileSizeToString:compressionSizes.large.fileSize round:NO], (int)compressionSizes.large.imageSize.width, (int)compressionSizes.large.imageSize.height];