convert db

iOSClient/Create/CCCreateCloud.swift

@@ -270,7 +270,10 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         row = XLFormRowDescriptor(tag: "useSubFolder", rowType: XLFormRowDescriptorTypeBooleanSwitch, title: NSLocalizedString("_upload_camera_create_subfolder_", comment: ""))
         row.hidden = "$\("useFolderPhoto") == 0"
         
-        if CCCoreData.getCameraUploadCreateSubfolderActiveAccount(appDelegate.activeAccount) == true {
+        let tableAccount = NCManageDatabase.sharedInstance.getAccountActive()
+        
+        //if CCCoreData.getCameraUploadCreateSubfolderActiveAccount(appDelegate.activeAccount) == true {
+        if tableAccount?.cameraUploadCreateSubfolder == true {
             row.value = 1
         } else {
             row.value = 0

iOSClient/FileSystem/CCCoreData.h

@@ -60,15 +60,15 @@
 //+ (NSString *)getCameraUploadFolderNamePathActiveAccount:(NSString *)activeAccount activeUrl:(NSString *)activeUrl;
 
 //+ (BOOL)getCameraUploadActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadBackgroundActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadCreateSubfolderActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadFullPhotosActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadPhotoActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadVideoActiveAccount:(NSString *)activeAccount;
-+ (NSDate *)getCameraUploadDatePhotoActiveAccount:(NSString *)activeAccount;
-+ (NSDate *)getCameraUploadDateVideoActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadWWanPhotoActiveAccount:(NSString *)activeAccount;
-+ (BOOL)getCameraUploadWWanVideoActiveAccount:(NSString *)activeAccount;
+//+ (BOOL)getCameraUploadBackgroundActiveAccount:(NSString *)activeAccount;
+//+ (BOOL)getCameraUploadCreateSubfolderActiveAccount:(NSString *)activeAccount;
+//+ (BOOL)getCameraUploadFullPhotosActiveAccount:(NSString *)activeAccount;
+//+ (BOOL)getCameraUploadPhotoActiveAccount:(NSString *)activeAccount;
+//+ (BOOL)getCameraUploadVideoActiveAccount:(NSString *)activeAccount;
+//+ (NSDate *)getCameraUploadDatePhotoActiveAccount:(NSString *)activeAccount;
+//+ (NSDate *)getCameraUploadDateVideoActiveAccount:(NSString *)activeAccount;
+//+ (BOOL)getCameraUploadWWanPhotoActiveAccount:(NSString *)activeAccount;
+//+ (BOOL)getCameraUploadWWanVideoActiveAccount:(NSString *)activeAccount;
 
 + (void)setCameraUpload:(BOOL)state activeAccount:(NSString *)activeAccount;
 + (void)setCameraUploadBackground:(BOOL)state activeAccount:(NSString *)activeAccount;

iOSClient/FileSystem/CCCoreData.m

@@ -213,7 +213,7 @@
     if (record) return [record.cameraUpload boolValue];
     else return NO;
 }
-*/
+
 + (BOOL)getCameraUploadBackgroundActiveAccount:(NSString *)activeAccount
 {
     NSPredicate *predicate = [NSPredicate predicateWithFormat:@"(account == %@)", activeAccount];
@@ -294,7 +294,7 @@
     if (record) return [record.cameraUploadWWAnVideo boolValue];
     else return NO;
 }
-
+*/
 // ******** SET *********
 
 + (void)setCameraUpload:(BOOL)state activeAccount:(NSString *)activeAccount
@@ -395,6 +395,7 @@
 
 + (void)setCameraUploadDateAssetType:(PHAssetMediaType)assetMediaType assetDate:(NSDate *)assetDate activeAccount:(NSString *)activeAccount
 {
+    /*
     if (assetMediaType == PHAssetMediaTypeImage && [assetDate compare:[self getCameraUploadDatePhotoActiveAccount:activeAccount]] ==  NSOrderedDescending && assetDate) {
         [self setCameraUploadDatePhoto:assetDate];
     }
@@ -402,6 +403,7 @@
     if (assetMediaType == PHAssetMediaTypeVideo && [assetDate compare:[self getCameraUploadDateVideoActiveAccount:activeAccount]] ==  NSOrderedDescending && assetDate) {
         [self setCameraUploadDateVideo:assetDate];
     }
+    */ 
 }
 
 + (void)setCameraUploadWWanPhoto:(BOOL)wWan activeAccount:(NSString *)activeAccount

iOSClient/ManageLocation+ManageAsset/CCManageAsset.m

@@ -87,7 +87,8 @@
     
     // Photo
     
-    if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount]) {
+    //if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount]) {
+    if (tableAccount.cameraUploadPhoto) {
         
         dispatch_semaphore_t semaphoreAsset = dispatch_semaphore_create(0);
 
@@ -118,7 +119,8 @@
     
     // Video
     
-    if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount]) {
+    //if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount]) {
+    if (tableAccount.cameraUploadVideo) {
         
         dispatch_semaphore_t semaphoreAsset = dispatch_semaphore_create(0);
         

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -771,17 +771,17 @@
 
 - (void)initStateCameraUpload
 {
-    NSArray *results = [[NCManageDatabase sharedInstance] getAccounts:app.activeAccount];
-    tableAccount *account = [results objectAtIndex:0];
+    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
 
     
    // if([CCCoreData getCameraUploadActiveAccount:app.activeAccount]) {
     
-    if (account.cameraUpload) {
+    if (tableAccount.cameraUpload) {
         
         [self setupCameraUpload];
         
-        if([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount])
+        //if([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount])
+        if (tableAccount.cameraUploadBackground)
             [self checkIfLocationIsEnabled];
         
     } else {
@@ -940,7 +940,10 @@
         }
     }
     
-    return [CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount];
+    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
+    return tableAccount.cameraUploadBackground;
+    
+   // return [CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount];
 }
 
 
@@ -982,7 +985,11 @@
             
         } else if ([CLLocationManager authorizationStatus] != kCLAuthorizationStatusNotDetermined){
             
-            if ([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount]) {
+            tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
+            
+            if (tableAccount.cameraUploadBackground) {
+            
+            //if ([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount]) {
                 
                 [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
                 [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
@@ -1068,6 +1075,7 @@
 {
     CCManageAsset *manageAsset = [[CCManageAsset alloc] init];
     NSMutableArray *newItemsToUpload;
+    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     // Is loading new Asset ?
     if (app.automaticCheckAssetInProgress)
@@ -1080,8 +1088,12 @@
         
     } else {
         
-        NSDate *databaseDateVideo = [CCCoreData getCameraUploadDateVideoActiveAccount:app.activeAccount];
-        NSDate *databaseDatePhoto = [CCCoreData getCameraUploadDatePhotoActiveAccount:app.activeAccount];
+        //NSDate *databaseDateVideo = [CCCoreData getCameraUploadDateVideoActiveAccount:app.activeAccount];
+        //NSDate *databaseDatePhoto = [CCCoreData getCameraUploadDatePhotoActiveAccount:app.activeAccount];
+        
+        NSDate *databaseDatePhoto = tableAccount.cameraUploadDatePhoto;
+        NSDate *databaseDateVideo = tableAccount.cameraUploadDateVideo;
+        
         
         newItemsToUpload = [manageAsset getCameraRollNewItemsWithDatePhoto:databaseDatePhoto dateVideo:databaseDateVideo];
     }
@@ -1126,10 +1138,12 @@
 - (void)uploadAssetsToNetwork:(NSMutableArray *)newItemsToUpload assetsFull:(BOOL)assetsFull
 {
     NSMutableArray *newItemsPHAssetToUpload = [[NSMutableArray alloc] init];
+    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     //NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     NSString *folderPhotos = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:app.activeUrl];
-    BOOL useSubFolder = [CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount];
+    //BOOL useSubFolder = [CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount];
+    BOOL useSubFolder = tableAccount.cameraUploadCreateSubfolder;
     
     // Conversion from ALAsset -to-> PHAsset
     for (ALAsset *asset in newItemsToUpload) {
@@ -1166,11 +1180,18 @@
         
         // Select type of session
         
+        /*
         if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount] == NO) session = k_upload_session;
         if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount] == NO) session = k_upload_session;
         if (assetMediaType == PHAssetMediaTypeImage && [CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount]) session = k_upload_session_wwan;
         if (assetMediaType == PHAssetMediaTypeVideo && [CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount]) session = k_upload_session_wwan;
-
+         */
+        
+        if (assetMediaType == PHAssetMediaTypeImage && tableAccount.cameraUploadWWAnPhoto == NO) session = k_upload_session;
+        if (assetMediaType == PHAssetMediaTypeVideo && tableAccount.cameraUploadWWAnVideo == NO) session = k_upload_session;
+        if (assetMediaType == PHAssetMediaTypeImage && tableAccount.cameraUploadWWAnPhoto) session = k_upload_session_wwan;
+        if (assetMediaType == PHAssetMediaTypeVideo && tableAccount.cameraUploadWWAnVideo) session = k_upload_session_wwan;
+        
         NSDateFormatter *formatter = [NSDateFormatter new];
         
         [formatter setDateFormat:@"yyyy"];

iOSClient/Settings/CCManageCameraUpload.m

@@ -59,6 +59,8 @@
     XLFormDescriptor *form ;
     XLFormSectionDescriptor *section;
     XLFormRowDescriptor *row;
+    
+    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
 
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeTheming) name:@"changeTheming" object:nil];
     
@@ -72,7 +74,6 @@
 
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"cameraupload" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_camera_", nil)];
     
-    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     if (tableAccount.cameraUpload) row.value = @1;
     //if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount]) row.value = @1;
     else row.value = @0;
@@ -86,14 +87,16 @@
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadphoto" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_foto_camera_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
-    if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount]) row.value = @1;
+    //if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount]) row.value = @1;
+    if (tableAccount.cameraUploadPhoto) 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;
+    //if ([CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount] == YES) row.value = @1;
+    if (tableAccount.cameraUploadWWAnPhoto) row.value = @1;
     else row.value = @0;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
@@ -105,14 +108,16 @@
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadvideo" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_video_camera_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
-    if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount]) row.value = @1;
+    //if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount]) row.value = @1;
+    if (tableAccount.cameraUploadVideo) 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;
+    //if ([CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount] == YES) row.value = @1;
+    if (tableAccount.cameraUploadWWAnVideo) row.value = @1;
     else row.value = @0;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
@@ -124,7 +129,8 @@
 
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadbackground" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_camera_background_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
-    if ([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount]) row.value = @1;
+    //if ([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount]) row.value = @1;
+    if (tableAccount.cameraUploadBackground) row.value = @1;
     else row.value = @0;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
@@ -137,7 +143,8 @@
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadallphotos" rowType:XLFormRowDescriptorTypeBooleanSwitch title:title];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
     row.value = 0;
-    if ([CCCoreData getCameraUploadFullPhotosActiveAccount:app.activeAccount]) row.value = @1;
+    //if ([CCCoreData getCameraUploadFullPhotosActiveAccount:app.activeAccount]) row.value = @1;
+    if (tableAccount.cameraUploadFull) row.value = @1;
     else row.value = @0;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
@@ -149,7 +156,8 @@
     
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"camerauploadcreatesubfolder" rowType:XLFormRowDescriptorTypeBooleanSwitch title:NSLocalizedString(@"_upload_camera_create_subfolder_", nil)];
     row.hidden = [NSString stringWithFormat:@"$%@==0", @"cameraupload"];
-    if ([CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount]) row.value = @1;
+    //if ([CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount]) row.value = @1;
+    if (tableAccount.cameraUploadCreateSubfolder) row.value = @1;
     else row.value = @0;
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [section addFormRow:row];
@@ -199,6 +207,8 @@
 {
     [super formRowDescriptorValueHasChanged:rowDescriptor oldValue:oldValue newValue:newValue];
     
+    tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
+    
     if ([rowDescriptor.tag isEqualToString:@"cameraupload"]) {
         
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
@@ -214,13 +224,16 @@
             [CCCoreData setCameraUploadFolderPath:nil activeUrl:app.activeUrl activeAccount:app.activeAccount];
             
             // verifichiamo che almeno uno dei servizi (foto video) siano attivi, in caso contrario attiviamo le foto
-            if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount] == NO && [CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount] == NO)
+            //if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount] == NO && [CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount] == NO)
+            if (tableAccount.cameraUploadPhoto == NO && tableAccount.cameraUploadVideo == NO)
                 [CCCoreData setCameraUploadPhoto:YES activeAccount:app.activeAccount];
             
             // Settings date
-            if([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount])
+            //if([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount])
+            if (tableAccount.cameraUploadPhoto)
                 [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
-            if([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount])
+            //if([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount])
+            if (tableAccount.cameraUploadVideo)
                 [CCCoreData setCameraUploadDateVideo:[NSDate date]];
             
         } else {
@@ -361,25 +374,32 @@
     if (tableAccount.cameraUpload)
         [rowCameraupload setValue:@1]; else [rowCameraupload setValue:@0];
     
-    if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount])
+    //if ([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount])
+    if (tableAccount.cameraUploadPhoto)
         [rowCamerauploadphoto setValue:@1]; else [rowCamerauploadphoto setValue:@0];
     
-    if ([CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount])
+    //if ([CCCoreData getCameraUploadWWanPhotoActiveAccount:app.activeAccount])
+    if (tableAccount.cameraUploadWWAnPhoto)
         [rowCamerauploadwwanphoto setValue:@1]; else [rowCamerauploadwwanphoto setValue:@0];
     
-    if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount])
+    //if ([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount])
+    if (tableAccount.cameraUploadVideo)
         [rowCamerauploadvideo setValue:@1]; else [rowCamerauploadvideo setValue:@0];
     
-    if ([CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount])
+    //if ([CCCoreData getCameraUploadWWanVideoActiveAccount:app.activeAccount])
+    if (tableAccount.cameraUploadWWAnVideo)
         [rowCamerauploadwwanvideo setValue:@1]; else [rowCamerauploadwwanvideo setValue:@0];
     
-    if ([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount])
+    //if ([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount])
+    if (tableAccount.cameraUploadBackground)
         [rowCamerauploadBackground setValue:@1]; else [rowCamerauploadBackground setValue:@0];
     
-    if ([CCCoreData getCameraUploadFullPhotosActiveAccount:app.activeAccount])
+    //if ([CCCoreData getCameraUploadFullPhotosActiveAccount:app.activeAccount])
+    if (tableAccount.cameraUploadFull)
         [rowCamerauploadAllPhotos setValue:@1]; else [rowCamerauploadAllPhotos setValue:@0];
     
-    if ([CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount])
+    //if ([CCCoreData getCameraUploadCreateSubfolderActiveAccount:app.activeAccount])
+    if (tableAccount.cameraUploadCreateSubfolder)
         [rowCamerauploadCreateSubfolder setValue:@1]; else [rowCamerauploadCreateSubfolder setValue:@0];
     
     // - HIDDEN ---------------------