remove auto upload encrypted

iOSClient/FileSystem/CCCoreData.h

@@ -66,8 +66,6 @@
 + (BOOL)getCameraUploadVideoActiveAccount:(NSString *)activeAccount;
 + (NSDate *)getCameraUploadDatePhotoActiveAccount:(NSString *)activeAccount;
 + (NSDate *)getCameraUploadDateVideoActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadCryptatedPhotoActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadCryptatedVideoActiveAccount:(NSString *)activeAccount;
 + (BOOL)getCameraUploadWWanPhotoActiveAccount:(NSString *)activeAccount;
 + (BOOL)getCameraUploadWWanVideoActiveAccount:(NSString *)activeAccount;
 
@@ -80,8 +78,6 @@
 + (void)setCameraUploadDatePhoto:(NSDate *)date;
 + (void)setCameraUploadDateVideo:(NSDate *)date;
 + (void)setCameraUploadDateAssetType:(PHAssetMediaType)assetMediaType assetDate:(NSDate *)assetDate activeAccount:(NSString *)activeAccount;
-+ (void)setCameraUploadCryptatedPhoto:(BOOL)cryptated activeAccount:(NSString *)activeAccount;
-+ (void)setCameraUploadCryptatedVideo:(BOOL)cryptated activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadWWanPhoto:(BOOL)wWan activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadWWanVideo:(BOOL)wWan activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadFolderName:(NSString *)fileName activeAccount:(NSString *)activeAccount;

iOSClient/FileSystem/CCCoreData.m

@@ -63,9 +63,6 @@
         record.cameraUploadWWAnVideo = [NSNumber numberWithBool:NO];
     }
     
-    record.cameraUploadCryptatedPhoto = [NSNumber numberWithBool:NO];
-    record.cameraUploadCryptatedVideo = [NSNumber numberWithBool:NO];
-
     record.optimization = [NSDate date];
     record.password = password;
     record.url = url;
@@ -274,24 +271,6 @@
     else return nil;
 }
 
-+ (BOOL)getCameraUploadCryptatedPhotoActiveAccount:(NSString *)activeAccount
-{
-    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
-    TableAccount *record = [TableAccount MR_findFirstWithPredicate:predicate];
-    
-    if (record) return [record.cameraUploadCryptatedPhoto boolValue];
-    else return NO;
-}
-
-+ (BOOL)getCameraUploadCryptatedVideoActiveAccount:(NSString *)activeAccount
-{
-    NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
-    TableAccount *record = [TableAccount MR_findFirstWithPredicate:predicate];
-    
-    if (record) return [record.cameraUploadCryptatedVideo boolValue];
-    else return NO;
-}
-
 + (BOOL)getCameraUploadWWanPhotoActiveAccount:(NSString *)activeAccount
 {
     NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
@@ -417,30 +396,6 @@
     }
 }
 
-+ (void)setCameraUploadCryptatedPhoto:(BOOL)cryptated activeAccount:(NSString *)activeAccount
-{
-    [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
-
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
-        TableAccount *record = [TableAccount MR_findFirstWithPredicate:predicate inContext:localContext];
-    
-        if (record)
-            record.cameraUploadCryptatedPhoto = [NSNumber numberWithBool:cryptated];
-    }];
-}
-
-+ (void)setCameraUploadCryptatedVideo:(BOOL)cryptated activeAccount:(NSString *)activeAccount
-{
-    [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {
-        
-        NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
-        TableAccount *record = [TableAccount MR_findFirstWithPredicate:predicate inContext:localContext];
-    
-        if (record)
-            record.cameraUploadCryptatedVideo = [NSNumber numberWithBool:cryptated];
-    }];
-}
-
 + (void)setCameraUploadWWanPhoto:(BOOL)wWan activeAccount:(NSString *)activeAccount
 {
     [MagicalRecord saveWithBlockAndWait:^(NSManagedObjectContext *localContext) {

iOSClient/FileSystem/TableAccount+CoreDataProperties.h

@@ -20,8 +20,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nullable, nonatomic, copy) NSNumber *cameraUpload;
 @property (nullable, nonatomic, copy) NSNumber *cameraUploadBackground;
 @property (nullable, nonatomic, copy) NSNumber *cameraUploadCreateSubfolder;
-@property (nullable, nonatomic, copy) NSNumber *cameraUploadCryptatedPhoto;
-@property (nullable, nonatomic, copy) NSNumber *cameraUploadCryptatedVideo;
 @property (nullable, nonatomic, copy) NSDate *cameraUploadDatePhoto;
 @property (nullable, nonatomic, copy) NSDate *cameraUploadDateVideo;
 @property (nullable, nonatomic, copy) NSString *cameraUploadFolderName;

iOSClient/FileSystem/TableAccount+CoreDataProperties.m

@@ -19,8 +19,6 @@
 @dynamic cameraUpload;
 @dynamic cameraUploadBackground;
 @dynamic cameraUploadCreateSubfolder;
-@dynamic cameraUploadCryptatedPhoto;
-@dynamic cameraUploadCryptatedVideo;
 @dynamic cameraUploadDatePhoto;
 @dynamic cameraUploadDateVideo;
 @dynamic cameraUploadFolderName;

iOSClient/Settings/CCManageCameraUpload.m

@@ -93,16 +93,6 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
 
-    if (app.isCryptoCloudMode) {
-        
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadcryptatedphoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_encry_camup_", nil)];
-        row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
-        if ([CCCoreData getCameraUploadCryptatedPhotoActiveAccount:app.activeAccount] == YES) row.value = @1;
-        else row.value = @0;
-        [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-        [section addFormRow:row];
-    }
-    
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadwwanphoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_wifi_only_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
     if ([CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount] == YES) row.value = @1;
@@ -122,16 +112,6 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
     
-    if (app.isCryptoCloudMode) {
-        
-        row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadcryptatedvideo" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_encry_camup_", nil)];
-        row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
-        if ([CCCoreData getCameraUploadCryptatedVideoActiveAccount:app.activeAccount] == YES) row.value = @1;
-        else row.value = @0;
-        [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-        [section addFormRow:row];
-    }
-    
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadwwanvideo" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_wifi_only_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
     if ([CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount] == YES) row.value = @1;
@@ -320,11 +300,6 @@
         [CCCoreData setCameraUploadPhoto:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
     }
     
-    if ([rowDescriptor.tag isEqualToString:@"camerauploadcryptatedphoto"]) {
-        
-       [CCCoreData setCameraUploadCryptatedPhoto:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
-    }
-    
     if ([rowDescriptor.tag isEqualToString:@"camerauploadwwanphoto"]) {
         
         [CCCoreData setCameraUploadWWanPhoto:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
@@ -344,11 +319,6 @@
         [CCCoreData setCameraUploadVideo:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
     }
     
-    if ([rowDescriptor.tag isEqualToString:@"camerauploadcryptatedvideo"]) {
-        
-        [CCCoreData setCameraUploadCryptatedVideo:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
-    }
-    
     if ([rowDescriptor.tag isEqualToString:@"camerauploadwwanvideo"]) {
         
         [CCCoreData setCameraUploadWWanVideo:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
@@ -394,18 +364,12 @@
     if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount])
         [rowCamerauploadphoto setValue:@1]; else [rowCamerauploadphoto setValue:@0];
     
-    if ([CCCoreData getCameraUploadCryptatedPhotoActiveAccount:app.activeAccount])
-        [rowCamerauploadcryptatedphoto setValue:@1]; else [rowCamerauploadcryptatedphoto setValue:@0];
-    
     if ([CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount])
         [rowCamerauploadwwanphoto setValue:@1]; else [rowCamerauploadwwanphoto setValue:@0];
     
     if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount])
         [rowCamerauploadvideo setValue:@1]; else [rowCamerauploadvideo setValue:@0];
     
-    if ([CCCoreData getCameraUploadCryptatedVideoActiveAccount:app.activeAccount])
-        [rowCamerauploadcryptatedvideo setValue:@1]; else [rowCamerauploadcryptatedvideo setValue:@0];
-    
     if ([CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount])
         [rowCamerauploadwwanvideo setValue:@1]; else [rowCamerauploadwwanvideo setValue:@0];
     

iOSClient/cryptocloud.xcdatamodeld/cryptocloud 9.xcdatamodel/contents

@@ -7,8 +7,6 @@
         <attribute name="cameraUpload" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="cameraUploadBackground" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="cameraUploadCreateSubfolder" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="cameraUploadCryptatedPhoto" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
-        <attribute name="cameraUploadCryptatedVideo" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="cameraUploadDatePhoto" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="cameraUploadDateVideo" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="cameraUploadFolderName" optional="YES" attributeType="String" syncable="YES"/>
@@ -96,7 +94,7 @@
         <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
     </entity>
     <elements>
-        <element name="TableAccount" positionX="-6597" positionY="111" width="171" height="540"/>
+        <element name="TableAccount" positionX="-6597" positionY="111" width="171" height="510"/>
         <element name="TableDirectory" positionX="-6372" positionY="111" width="162" height="210"/>
         <element name="TableLocalFile" positionX="-6138" positionY="111" width="162" height="225"/>
         <element name="TableMetadata" positionX="-6138" positionY="402" width="162" height="510"/>