fix

iOSClient/AppDelegate.m

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

iOSClient/Favorites/CCSynchronize.m

@@ -92,7 +92,6 @@
 - (void)listingFavoritesSuccess:(CCMetadataNet *)metadataNet metadatas:(NSArray *)metadatas
 {
     // verify active user
-    //TableAccount *record = [CCCoreData getActiveAccount];
     tableAccount *record = [[NCManageDatabase sharedInstance] getAccountActive];
     
     if (![record.account isEqualToString:metadataNet.account])
@@ -259,7 +258,6 @@
 // MULTI THREAD
 - (void)readFolderSuccess:(CCMetadataNet *)metadataNet permissions:(NSString *)permissions etag:(NSString *)etag metadatas:(NSArray *)metadatas
 {
-    //TableAccount *recordAccount = [CCCoreData getActiveAccount];
     tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
     
     __block NSMutableArray *metadatasForVerifyChange = [NSMutableArray new];

iOSClient/Main/CCMain.m

@@ -1193,7 +1193,6 @@
 
 - (void)getUserProfileSuccess:(CCMetadataNet *)metadataNet userProfile:(OCUserProfile *)userProfile
 {
-    //[CCCoreData setUserProfileActiveAccount:metadataNet.account userProfile:userProfile];
     [[NCManageDatabase sharedInstance] setAccountsUserProfile:metadataNet.account userProfile:userProfile];
 
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{

iOSClient/Networking/OCNetworking.m

@@ -336,8 +336,6 @@
         NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
         NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:_activeUrl];
         
-        //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
-        //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
         NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
         
         // Update metadataNet.directoryID
@@ -576,8 +574,6 @@
         
         NSMutableArray *metadatas = [NSMutableArray new];
         
-        //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
-        //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
         NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
         NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:_activeUrl];
 
@@ -906,7 +902,6 @@
     
     [communication readFile:fileName onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSArray *items, NSString *redirectedServer) {
         
-        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         if ([recordAccount.account isEqualToString:_metadataNet.account] && [items count] > 0) {
@@ -920,8 +915,6 @@
             NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
             NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:_activeUrl];
 
-            //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_metadataNet.account];
-            //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_metadataNet.account activeUrl:_activeUrl];
             NSString *directoryUser = [CCUtility getDirectoryActiveUser:_activeUser activeUrl:_activeUrl];
         
             metadata = [CCUtility trasformedOCFileToCCMetadata:itemDto fileNamePrint:_metadataNet.fileNamePrint serverUrl:_metadataNet.serverUrl directoryID:directoryID cameraFolderName:cameraFolderName cameraFolderPath:cameraFolderPath activeAccount:_metadataNet.account directoryUser:directoryUser];
@@ -942,7 +935,6 @@
         
     } failureRequest:^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
         
-        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         _metadataNet.errorRetry++;
@@ -1589,7 +1581,6 @@
     
     [communication getCapabilitiesOfServer:[_activeUrl stringByAppendingString:@"/"] onCommunication:communication successRequest:^(NSHTTPURLResponse *response, OCCapabilities *capabilities, NSString *redirectedServer) {
         
-        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         if ([self.delegate respondsToSelector:@selector(getCapabilitiesOfServerSuccess:)] && [recordAccount.account isEqualToString:_metadataNet.account])

iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -268,11 +268,8 @@
     paragraph.lineBreakMode = NSLineBreakByWordWrapping;
     paragraph.alignment = NSTextAlignmentCenter;
     NSString *text;
+    tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
     
-    NSArray *results = [[NCManageDatabase sharedInstance] getAccounts:app.activeAccount];
-    tableAccount *account = [results objectAtIndex:0];
-    
-    //if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount])
     if (account.cameraUpload)
         text = [NSString stringWithFormat:@"%@", @"\n\n\n\n"];
     else
@@ -285,11 +282,8 @@
 
 - (UIImage *)buttonImageForEmptyDataSet:(UIScrollView *)scrollView forState:(UIControlState)state
 {
-    NSArray *results = [[NCManageDatabase sharedInstance] getAccounts:app.activeAccount];
-    tableAccount *account = [results objectAtIndex:0];
-    
-    //if ([CCCoreData getCameraUploadActiveAccount:app.activeAccount] == NO) {
-        
+    tableAccount *account = [[NCManageDatabase sharedInstance] getAccountActive];
+            
     if (!account.cameraUpload) {
     
         UIImage *buttonImage = [CCGraphics changeThemingColorImage:[UIImage imageNamed:@"button"] color:[NCBrandColor sharedInstance].brand];
@@ -533,7 +527,6 @@
     if (app.activeAccount.length == 0)
         return;
     
-    //NSString *serverUrl = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     NSString *serverUrl = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPathAndName:app.activeUrl];
 
     if (_sectionDataSource) {
@@ -775,9 +768,6 @@
 {
     tableAccount *tableAccount = [[NCManageDatabase sharedInstance] getAccountActive];
 
-    
-   // if([CCCoreData getCameraUploadActiveAccount:app.activeAccount]) {
-    
     if (tableAccount.cameraUpload) {
         
         [self setupCameraUpload];
@@ -789,9 +779,7 @@
     } else {
         
         [[NCManageDatabase sharedInstance] setAccountCameraStateFiledWithField:@"cameraUpload" state:NO];
-        
-        //[CCCoreData setCameraUpload:NO activeAccount:app.activeAccount];
-                
+                        
         [PHPhotoLibrary.sharedPhotoLibrary unregisterChangeObserver:self];
         
         [[CCManageLocation sharedInstance] stopSignificantChangeUpdates];