replace db

iOSClient/AppDelegate.m

@@ -339,7 +339,7 @@
     
     NSLog(@"[LOG] Update Folder Photo");
     //NSString *folderCameraUpload = [CCCoreData getCameraUploadFolderNamePathActiveAccount:self.activeAccount activeUrl:self.activeUrl];
-    NSString *folderCameraUpload = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:self.activeAccount activeUrl:self.activeUrl];
+    NSString *folderCameraUpload = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:_activeUrl];
     if ([folderCameraUpload length] > 0)
         [[CCSynchronize sharedSynchronize] readFolderServerUrl:folderCameraUpload directoryID:[CCCoreData getDirectoryIDFromServerUrl:folderCameraUpload activeAccount:self.activeAccount] selector:selectorReadFolder];
 

iOSClient/Favorites/CCFavorites.m

@@ -163,8 +163,8 @@
     //if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount]) {
     if (tableAccount.cameraUpload) {
         
-        [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
-        [CCCoreData setCameraUploadDateVideo:[NSDate date]];
+        [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
+        [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
     }
 }
 

iOSClient/Local storage/CCLocalStorage.m

@@ -156,8 +156,8 @@
     //if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount]) {
     if (tableAccount.cameraUpload) {
         
-        [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
-        [CCCoreData setCameraUploadDateVideo:[NSDate date]];
+        [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
+        [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
     }
 }
 
@@ -267,8 +267,8 @@
     //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
     //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     
-    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:nil];
-    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeAccount activeUrl:app.activeUrl];
+    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeUrl];
 
     metadata = [CCUtility insertFileSystemInMetadata:[dataSource objectAtIndex:indexPath.row] directory:_serverUrl activeAccount:app.activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
         
@@ -365,8 +365,8 @@
     //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
     //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     
-    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:nil];
-    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeAccount activeUrl:app.activeUrl];
+    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeUrl];
         
     return [CCUtility insertFileSystemInMetadata:[dataSource objectAtIndex:indexPath.row] directory:_serverUrl activeAccount:app.activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
 }
@@ -425,8 +425,8 @@
     //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
     //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     
-    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:nil];
-    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeAccount activeUrl:app.activeUrl];
+    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeUrl];
         
     metadata = [CCUtility insertFileSystemInMetadata:[dataSource objectAtIndex:indexPath.row] directory:_serverUrl activeAccount:app.activeAccount cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath];
         
@@ -571,8 +571,8 @@
     //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
     //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     
-    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:nil];
-    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeAccount activeUrl:app.activeUrl];
+    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+    NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeUrl];
         
     for (NSString *fileName in dataSource) {
             

iOSClient/Main/CCDetail.m

@@ -204,9 +204,8 @@
         
     if (tableAccount.cameraUpload) {
         
-        
-        [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
-        [CCCoreData setCameraUploadDateVideo:[NSDate date]];
+        [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
+        [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
     }
 }
 

iOSClient/Main/CCMain.m

@@ -781,9 +781,8 @@
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     if (tableAccount.cameraUpload) {
         
-        [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
-        [CCCoreData setCameraUploadDateVideo:[NSDate date]];
-        
+        [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
+        [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
     }
     
     /*
@@ -1484,7 +1483,8 @@
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_image]) {
             
             // evitiamo il rimando photo
-            [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
+            //[CCCoreData setCameraUploadDatePhoto:[NSDate date]];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
 
             UIImage *image = [UIImage imageWithContentsOfFile:file];
             
@@ -1497,7 +1497,8 @@
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_video]) {
             
             // we avoid the cross-reference video
-            [CCCoreData setCameraUploadDateVideo:[NSDate date]];
+            //[CCCoreData setCameraUploadDateVideo:[NSDate date]];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
             
             [[NSFileManager defaultManager] linkItemAtPath:file toPath:[NSTemporaryDirectory() stringByAppendingString:metadata.fileNamePrint] error:nil];
             
@@ -1687,7 +1688,7 @@
     NSString *session = [arguments objectAtIndex:4];
     
     //NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
-    NSString *folderPhotos = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:app.activeUrl];
+    NSString *folderPhotos = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeUrl];
 
     NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount];
     
@@ -2444,7 +2445,7 @@
     if (![fileNameFolder length]) return;
     
     //if (folderCameraUpload) metadataNet.serverUrl = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
-    if (folderCameraUpload) metadataNet.serverUrl = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeAccount activeUrl:app.activeUrl];
+    if (folderCameraUpload) metadataNet.serverUrl = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeUrl];
     else  metadataNet.serverUrl = _serverUrl;
     
     metadataNet.action = actionCreateFolder;
@@ -2499,7 +2500,7 @@
 
 - (void)createFolderCameraUpload
 {
-    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:nil];
+    NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
 
     [self createFolder:cameraFolderName folderCameraUpload:YES];
 
@@ -4210,8 +4211,8 @@
         //NSString *cameraUploadFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:app.activeAccount];
         //NSString *cameraUploadFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
         
-        NSString *cameraUploadFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:app.activeAccount activeUrl:nil];
-        NSString *cameraUploadFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeAccount activeUrl:app.activeUrl];
+        NSString *cameraUploadFolderName = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderName:nil];
+        NSString *cameraUploadFolderPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeUrl];
         
         [actionSheet addButtonWithTitle: _metadata.fileNamePrint
                                   image: [CCGraphics changeThemingColorImage:[UIImage imageNamed:_metadata.iconName] color:[NCBrandColor sharedInstance].brand]
@@ -4311,8 +4312,12 @@
                                         NSString *oldPath = [[NCManageDatabase sharedInstance] getAccountsCameraUploadFolderPath:app.activeUrl];
 
                                         
-                                        [CCCoreData setCameraUploadFolderName:_metadata.fileName activeAccount:app.activeAccount];
-                                        [CCCoreData setCameraUploadFolderPath:serverUrl activeUrl:app.activeUrl activeAccount:app.activeAccount];
+                                        //[CCCoreData setCameraUploadFolderName:_metadata.fileName activeAccount:app.activeAccount];
+                                        //[CCCoreData setCameraUploadFolderPath:serverUrl activeUrl:app.activeUrl activeAccount:app.activeAccount];
+                                        
+                                        [[NCManageDatabase sharedInstance] setAccountsCameraUploadFolderNameWithFolderName:_metadata.fileName];
+                                        [[NCManageDatabase sharedInstance] setAccountsCameraUploadFolderPathWithPathName:serverUrl activeUrl:app.activeUrl];
+                                        
                                         
                                         [CCCoreData clearDateReadAccount:app.activeAccount serverUrl:oldPath directoryID:nil];
                                         

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -359,10 +359,12 @@
                     [dataToShare enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {
                         
                         if ([obj isKindOfClass:[UIImage class]])
-                            [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
+                            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
+                            //[CCCoreData setCameraUploadDatePhoto:[NSDate date]];
                         
                         if ([obj isKindOfClass:[NSURL class]])
-                            [CCCoreData setCameraUploadDateVideo:[NSDate date]];
+                            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
+                            //[CCCoreData setCameraUploadDateVideo:[NSDate date]];
                     }];
                     
                     [self performSelector:@selector(reloadCollection) withObject:nil];
@@ -786,7 +788,9 @@
         
     } else {
         
-        [CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUpload" state:NO];
+        
+        //[CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
                 
         [PHPhotoLibrary.sharedPhotoLibrary unregisterChangeObserver:self];
         
@@ -810,7 +814,9 @@
         
     } else {
     
-        [CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
+       // [CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
+        
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUpload" state:NO];
                 
         [PHPhotoLibrary.sharedPhotoLibrary unregisterChangeObserver:self];
         
@@ -837,7 +843,8 @@
         
     } else {
         
-        [CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
+        //[CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUpload" state:NO];
         
         [PHPhotoLibrary.sharedPhotoLibrary unregisterChangeObserver:self];
         
@@ -875,7 +882,8 @@
                 
                 if ([ALAssetsLibrary authorizationStatus] == ALAuthorizationStatusAuthorized) {
                     
-                    [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+                    //[CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+                    [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:NO];
                     
                     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_location_not_enabled_", nil)
                                                                     message:NSLocalizedString(@"_location_not_enabled_msg_", nil)
@@ -899,12 +907,14 @@
             
             if ([ALAssetsLibrary authorizationStatus] == ALAuthorizationStatusAuthorized) {
                 
-                [CCCoreData setCameraUploadBackground:YES activeAccount:app.activeAccount];
+                //[CCCoreData setCameraUploadBackground:YES activeAccount:app.activeAccount];ù
+                [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:YES];
                 [[CCManageLocation sharedInstance] startSignificantChangeUpdates];
                 
             } else {
                 
-                [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+               // [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+                [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:NO];
                 [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
                 
                 UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_access_photo_not_enabled_", nil)
@@ -918,7 +928,8 @@
         
     } else {
         
-        [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+        //[CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:NO];
         [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
         
         if ([ALAssetsLibrary authorizationStatus] == ALAuthorizationStatusAuthorized) {
@@ -969,7 +980,8 @@
                 
                 if ([CCManageLocation sharedInstance].firstChangeAuthorizationDone) {
                     
-                    [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+                    //[CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+                    [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:NO];
                     [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
                 }
                 
@@ -991,7 +1003,8 @@
             
             //if ([CCCoreData getCameraUploadBackgroundActiveAccount:app.activeAccount]) {
                 
-                [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+               // [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+                [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:NO];
                 [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
                 
                 if ([ALAssetsLibrary authorizationStatus] == ALAuthorizationStatusAuthorized) {
@@ -1047,9 +1060,12 @@
             
         } else {
             
-            [CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
+            
+            [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUpload" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:NO];
             
-            [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
             
             [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
             [PHPhotoLibrary.sharedPhotoLibrary unregisterChangeObserver:self];
@@ -1337,7 +1353,8 @@
         
         // Update Camera Upload data
         if ([metadataNet.selector isEqualToString:selectorUploadAutomatic])
-            [CCCoreData setCameraUploadDateAssetType:assetMediaType assetDate:assetDate activeAccount:appDelegate.activeAccount];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:assetMediaType assetDate:assetDate];
+            //[CCCoreData setCameraUploadDateAssetType:assetMediaType assetDate:assetDate activeAccount:appDelegate.activeAccount];
         
         // Update icon badge number
         [app updateApplicationIconBadgeNumber];

iOSClient/Settings/CCManageCameraUpload.m

@@ -217,32 +217,47 @@
             if (app.activeMain)
                 [app.activeMain createFolderCameraUpload];
             
-            [CCCoreData setCameraUpload:YES activeAccount:app.activeAccount];
+            [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUpload" state:YES];
+            
+            //[CCCoreData setCameraUpload:YES activeAccount:app.activeAccount];
             
             // Default
-            [CCCoreData setCameraUploadFolderName:nil activeAccount:app.activeAccount];
-            [CCCoreData setCameraUploadFolderPath:nil activeUrl:app.activeUrl activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUploadFolderName:nil activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUploadFolderPath:nil activeUrl:app.activeUrl activeAccount:app.activeAccount];
+            
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadFolderNameWithFolderName:nil];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadFolderPathWithPathName:nil activeUrl:app.activeUrl];
+            
             
             // 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 (tableAccount.cameraUploadPhoto == NO && tableAccount.cameraUploadVideo == NO)
-                [CCCoreData setCameraUploadPhoto:YES activeAccount:app.activeAccount];
+                [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadPhoto" state:YES];
+                //[CCCoreData setCameraUploadPhoto:YES activeAccount:app.activeAccount];
             
             // Settings date
             //if([CCCoreData getCameraUploadPhotoActiveAccount:app.activeAccount])
             if (tableAccount.cameraUploadPhoto)
-                [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
+                [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
+                //[CCCoreData setCameraUploadDatePhoto:[NSDate date]];
             //if([CCCoreData getCameraUploadVideoActiveAccount:app.activeAccount])
             if (tableAccount.cameraUploadVideo)
-                [CCCoreData setCameraUploadDateVideo:[NSDate date]];
+                [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
+                //[CCCoreData setCameraUploadDateVideo:[NSDate date]];
             
         } else {
             
-            [CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
-            [CCCoreData setCameraUploadFullPhotosActiveAccount:NO activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUploadFullPhotosActiveAccount:NO activeAccount:app.activeAccount];
+            
+            //[CCCoreData setCameraUploadDatePhoto:NULL];
+            //[CCCoreData setCameraUploadDateVideo:NULL];
             
-            [CCCoreData setCameraUploadDatePhoto:NULL];
-            [CCCoreData setCameraUploadDateVideo:NULL];
+            [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUpload" state:NO];
+            [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadFull" state:NO];
+            
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:nil];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:nil];
 
             // remove
             [[NCManageDatabase sharedInstance] clearTable:[tableAutomaticUpload class] account:app.activeAccount];
@@ -268,7 +283,8 @@
                 UIAlertView * alertView = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"_cameraupload_background_title_", nil) message:[CCUtility localizableBrand:@"_cameraupload_background_msg_" table:nil] delegate:nil cancelButtonTitle:nil otherButtonTitles:NSLocalizedString(@"_ok_", nil), nil];
                 [alertView show];
                     
-                [CCCoreData setCameraUploadBackground:YES activeAccount:app.activeAccount];
+                //[CCCoreData setCameraUploadBackground:YES activeAccount:app.activeAccount];
+                [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:YES];
                     
             } else {
                  
@@ -277,7 +293,8 @@
             
         } else {
             
-            [CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUploadBackground:NO activeAccount:app.activeAccount];
+            [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadBackground" state:NO];
             [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];
         }
     }
@@ -288,12 +305,14 @@
             
             [[NSNotificationCenter defaultCenter] postNotificationName:@"setupCameraUploadFull" object:nil];
             
-            [CCCoreData setCameraUploadFullPhotosActiveAccount:YES activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUploadFullPhotosActiveAccount:YES activeAccount:app.activeAccount];
+            [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadFull" state:YES];
             
         } else {
             
             [[NCManageDatabase sharedInstance] clearTable:[tableAutomaticUpload class] account:app.activeAccount];
-            [CCCoreData setCameraUploadFullPhotosActiveAccount:NO activeAccount:app.activeAccount];
+            //[CCCoreData setCameraUploadFullPhotosActiveAccount:NO activeAccount:app.activeAccount];
+            [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadFull" state:NO];
         }
     }
 
@@ -301,43 +320,54 @@
         
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
             
-            [CCCoreData setCameraUploadDatePhoto:[NSDate date]];
+            //[CCCoreData setCameraUploadDatePhoto:[NSDate date]];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:[NSDate date]];
             
         } else {
             
-            [CCCoreData setCameraUploadDatePhoto:NULL];
+            //[CCCoreData setCameraUploadDatePhoto:NULL];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeImage assetDate:nil];
         }
         
-        [CCCoreData setCameraUploadPhoto:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        //[CCCoreData setCameraUploadPhoto:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadPhoto" state:[[rowDescriptor.value valueData] boolValue]];
+        
     }
     
     if ([rowDescriptor.tag isEqualToString:@"camerauploadwwanphoto"]) {
         
-        [CCCoreData setCameraUploadWWanPhoto:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        //[CCCoreData setCameraUploadWWanPhoto:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadWWAnPhoto" state:[[rowDescriptor.value valueData] boolValue]];
     }
     
     if ([rowDescriptor.tag isEqualToString:@"camerauploadvideo"]) {
     
         if ([[rowDescriptor.value valueData] boolValue] == YES) {
                 
-            [CCCoreData setCameraUploadDateVideo:[NSDate date]];
+           // [CCCoreData setCameraUploadDateVideo:[NSDate date]];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:[NSDate date]];
 
         } else {
                 
-            [CCCoreData setCameraUploadDateVideo:NULL];
+           //[CCCoreData setCameraUploadDateVideo:NULL];
+            [[NCManageDatabase sharedInstance] setAccountsCameraUploadDateAssetTypeWithAssetMediaType:PHAssetMediaTypeVideo assetDate:nil];
         }
             
-        [CCCoreData setCameraUploadVideo:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        //[CCCoreData setCameraUploadVideo:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadVideo" state:[[rowDescriptor.value valueData] boolValue]];
     }
     
     if ([rowDescriptor.tag isEqualToString:@"camerauploadwwanvideo"]) {
         
-        [CCCoreData setCameraUploadWWanVideo:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        //[CCCoreData setCameraUploadWWanVideo:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadWWAnVideo" state:[[rowDescriptor.value valueData] boolValue]];
     }
     
     if ([rowDescriptor.tag isEqualToString:@"camerauploadcreatesubfolder"]) {
         
-        [CCCoreData setCameraUploadCreateSubfolderActiveAccount:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+       // [CCCoreData setCameraUploadCreateSubfolderActiveAccount:[[rowDescriptor.value valueData] boolValue] activeAccount:app.activeAccount];
+        [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUploadCreateSubfolder" state:[[rowDescriptor.value valueData] boolValue]];
     }
 }