Browse Source

possibility - convert public.heic to jpg

Marino Faggiana 7 years ago
parent
commit
a4eb322a5a

+ 1 - 1
iOSClient/Networking/CCNetworking.m

@@ -771,7 +771,7 @@
             
             [[PHImageManager defaultManager] requestImageDataForAsset:asset options:options resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
                 
-                if ([dataUTI isEqualToString:@"public.heic"]) {
+                if ([dataUTI isEqualToString:@"public.heic"] && [CCUtility getHeicToJpeg]) {
                     
                     UIImage *img = [UIImage imageWithData:imageData];
                     NSData *imageDataJPEG = UIImageJPEGRepresentation(img, 1.0);

+ 4 - 0
iOSClient/Utility/CCUtility.h

@@ -91,6 +91,8 @@
 
 + (void)setShowHiddenFiles:(BOOL)show;
 
++ (void)setHeicToJpeg:(BOOL)show;
+
 // GET
 
 + (NSString *)getKeyChainPasscodeForUUID:(NSString *)uuid;
@@ -135,6 +137,8 @@
 
 + (BOOL)getShowHiddenFiles;
 
++ (BOOL)getHeicToJpeg;
+
 // ===== Varius =====
 
 + (NSString *)getUserAgent;

+ 11 - 0
iOSClient/Utility/CCUtility.m

@@ -221,6 +221,12 @@
     [UICKeyChainStore setString:sShow forKey:@"showHiddenFiles" service:k_serviceShareKeyChain];
 }
 
++ (void)setHeicToJpeg:(BOOL)show
+{
+    NSString *sSet = (show) ? @"true" : @"false";
+    [UICKeyChainStore setString:sSet forKey:@"heicToJpeg" service:k_serviceShareKeyChain];
+}
+
 #pragma ------------------------------ GET
 
 + (NSString *)getKeyChainPasscodeForUUID:(NSString *)uuid
@@ -415,6 +421,11 @@
     return [[UICKeyChainStore stringForKey:@"showHiddenFiles" service:k_serviceShareKeyChain] boolValue];
 }
 
++ (BOOL)getHeicToJpeg
+{
+    return [[UICKeyChainStore stringForKey:@"heicToJpeg" service:k_serviceShareKeyChain] boolValue];
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Varius =====
 #pragma --------------------------------------------------------------------------------------------