remove Option optimized_photos : too complicated ... it generates confusion

iOSClient/Main/CCDetail.m

@@ -395,8 +395,6 @@
             status = k_metadataStatusNormal;
         }
         
-        NSString *ext = [[metadata.fileNameView pathExtension] uppercaseString];
-
         if ([CCUtility fileProviderStorageExists:metadata.fileID fileNameView:metadata.fileNameView] == NO && status == k_metadataStatusNormal) {
             
             if ([[NSFileManager defaultManager] fileExistsAtPath:[CCUtility getDirectoryProviderStorageIconFileID:metadata.fileID fileNameView:metadata.fileNameView]] == NO) {
@@ -413,16 +411,10 @@
                     self.navigationItem.titleView = nil;
                     self.title = metadata.fileNameView;
                     
-                    if (([CCUtility getOptimizedPhoto] == YES && errorCode != 0) || [CCUtility getOptimizedPhoto] == NO || [ext isEqualToString:@"GIF"]) {
-                        [self downloadPhotoBrowser:metadata serverUrl:serverUrl];
-                    }
-                    
                     [self.photoBrowser reloadData];
                 }];
             } else {
-                if ([CCUtility getOptimizedPhoto] == NO || [ext isEqualToString:@"GIF"]) {
-                    [self downloadPhotoBrowser:metadata serverUrl:serverUrl];
-                }
+                [self downloadPhotoBrowser:metadata serverUrl:serverUrl];
             }
         }
     }

iOSClient/Networking/CCNetworking.m

@@ -1226,14 +1226,6 @@
         // Remove icon B/N
         [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryProviderStorageIconFileID:metadata.fileID fileNameView:metadata.fileNameView] error:nil];
         
-        // Optimization
-        if (([CCUtility getOptimizedPhoto] || [metadata.sessionSelector isEqualToString:selectorUploadAutoUploadAll]) && ([metadata.typeFile isEqualToString:k_metadataTypeFile_image] || [metadata.typeFile isEqualToString:k_metadataTypeFile_video]) && isE2EEDirectory == NO) {
-            
-            [[NCManageDatabase sharedInstance] deleteLocalFileWithPredicate:[NSPredicate predicateWithFormat:@"fileID == %@", metadata.fileID]];
-
-            [[NSFileManager defaultManager] removeItemAtPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileNameView:metadata.fileNameView] error:nil];
-        }
-        
         // Copy photo or video in the photo album for auto upload
         if ([metadata.assetLocalIdentifier length] > 0 && ([metadata.sessionSelector isEqualToString:selectorUploadAutoUpload] || [metadata.sessionSelector isEqualToString:selectorUploadFile])) {
             

iOSClient/Networking/OCNetworking.m

@@ -461,18 +461,6 @@
 
             [preview writeToFile:file atomically:YES];
             
-            // Optimization Photo
-            NSString *ext = [[metadata.fileNameView pathExtension] uppercaseString];
-
-            if ([CCUtility getOptimizedPhoto] && [metadata.typeFile isEqualToString:k_metadataTypeFile_image] && [ext isEqualToString:@"GIF"] == NO) {
-                
-                NSString *file = [NSString stringWithFormat:@"%@/%@", [CCUtility getDirectoryProviderStorageFileID:metadata.fileID], metadata.fileNameView];
-                
-                [preview writeToFile:file atomically:YES];
-                
-                [[NCManageDatabase sharedInstance] addLocalFileWithMetadata:metadata];
-            }
-            
             completion(nil, 0);
             
         } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {

iOSClient/Settings/CCAdvanced.m

@@ -75,18 +75,6 @@
     row.action.formSelector = @selector(clearActivity:);
     [section addFormRow:row];
     
-    // Section OTTIMIZATIONS -------------------------------------------------
-    
-    section = [XLFormSectionDescriptor formSection];
-    [form addFormSection:section];
-    section.footerTitle = NSLocalizedString(@"_optimized_photos_how_", nil);
-    
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"optimizedphoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_optimized_photos_", nil)];
-    if ([CCUtility getOptimizedPhoto]) row.value = @"1";
-    else row.value = @"0";
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [section addFormRow:row];
-    
     // Section HIDDEN FILES -------------------------------------------------
 
     section = [XLFormSectionDescriptor formSection];
@@ -197,11 +185,6 @@
         appDelegate.activeActivity.storeDateFirstActivity = nil;
     }
     
-    if ([rowDescriptor.tag isEqualToString:@"optimizedphoto"]) {
-        
-        [CCUtility setOptimizedPhoto:[[rowDescriptor.value valueData] boolValue]];
-    }
-    
     if ([rowDescriptor.tag isEqualToString:@"showHiddenFiles"]) {
         
         [CCUtility setShowHiddenFiles:[[rowDescriptor.value valueData] boolValue]];

iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -225,10 +225,6 @@
 
 // Manage Advanced
 
-"_optimized_photos_"            = "Optimized photo resolution";
-"_upload_del_photos_"           = "Remove files after upload";
-"_optimized_photos_how_"        = "View, if possible, only low-resolution photos.";
-"_upload_del_photos_how_"       = "Files will be removed from device memory after they’ve been uploaded to your cloud. They will remain in the camera roll. Just download the files to see them.";
 "_show_hidden_files_"           = "Show hidden files";
 "_format_compatibility_"        = "Most Compatible";
 "_format_compatibility_footer_" = "\"Most compatible\" will save, when possible, photos as JPEG";

iOSClient/Utility/CCUtility.h

@@ -70,9 +70,6 @@
 + (BOOL)getOnlyLockDir;
 + (void)setOnlyLockDir:(BOOL)lockDir;
 
-+ (BOOL)getOptimizedPhoto;
-+ (void)setOptimizedPhoto:(BOOL)resize;
-
 + (NSString *)getOrderSettings;
 + (void)setOrderSettings:(NSString *)order;
 

iOSClient/Utility/CCUtility.m

@@ -180,25 +180,6 @@
     [UICKeyChainStore setString:sLockDir forKey:@"onlylockdir" service:k_serviceShareKeyChain];
 }
 
-+ (BOOL)getOptimizedPhoto
-{
-    NSString *result = [UICKeyChainStore stringForKey:@"optimizedphoto" service:k_serviceShareKeyChain];
-    
-    if (result == nil) {
-        
-        [self setOptimizedPhoto:NO];
-        return NO;
-    }
-    
-    return [result boolValue];
-}
-
-+ (void)setOptimizedPhoto:(BOOL)resize
-{
-    NSString *sOptimizedPhoto = (resize) ? @"true" : @"false";
-    [UICKeyChainStore setString:sOptimizedPhoto forKey:@"optimizedphoto" service:k_serviceShareKeyChain];
-}
-
 + (NSString *)getOrderSettings
 {
     NSString *order = [UICKeyChainStore stringForKey:@"order" service:k_serviceShareKeyChain];