fix

iOSClient/Create/CCCreateCloud.swift

@@ -272,7 +272,6 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
         
         let tableAccount = NCManageDatabase.sharedInstance.getAccountActive()
         
-        //if CCCoreData.getCameraUploadCreateSubfolderActiveAccount(appDelegate.activeAccount) == true {
         if tableAccount?.cameraUploadCreateSubfolder == true {
             row.value = 1
         } else {
@@ -473,9 +472,7 @@ class CreateFormUploadAssets: XLFormViewController, CCMoveDelegate {
             
             if (useFolderPhotoRow.value! as AnyObject).boolValue == true {
                 
-                self.serverUrl = NCManageDatabase.sharedInstance.getAccountCameraUploadFolderPathAndName(self.appDelegate.activeUrl)
-                
-                //self.serverUrl = CCCoreData.getCameraUploadFolderNamePathActiveAccount(self.appDelegate.activeAccount, activeUrl: self.appDelegate.activeUrl)
+                self.serverUrl = NCManageDatabase.sharedInstance.getAccountCameraUploadFolderPathAndName(self.appDelegate.activeUrl)                
                 useSubFolder = (useSubFolderRow.value! as AnyObject).boolValue
             }
             

iOSClient/Main/CCMain.m

@@ -1686,9 +1686,7 @@
     BOOL useSubFolder = [[arguments objectAtIndex:3] boolValue];
     NSString *session = [arguments objectAtIndex:4];
     
-    //NSString *folderPhotos = [CCCoreData getCameraUploadFolderNamePathActiveAccount:app.activeAccount activeUrl:app.activeUrl];
     NSString *folderPhotos = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPathAndName:app.activeUrl];
-
     NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount];
     
     // Create the folder for Photos & if request the subfolders

iOSClient/Main/CCMore.swift

@@ -193,7 +193,6 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         }
         
         // Display Name user & Quota
-        //tableAccont = CCCoreData.getActiveAccount()
         tabAccount = NCManageDatabase.sharedInstance.getAccountActive()
         if (tabAccount != nil) {
             

iOSClient/Networking/CCNetworking.m

@@ -883,8 +883,6 @@
     NSString *fileNameCrypto;
     
     // create Metadata
-    //NSString *cameraFolderName = [CCCoreData getCameraUploadFolderNameActiveAccount:_activeAccount];
-    //NSString *cameraFolderPath = [CCCoreData getCameraUploadFolderPathActiveAccount:_activeAccount activeUrl:_activeUrl];
     NSString *cameraFolderName = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderName];
     NSString *cameraFolderPath = [[NCManageDatabase sharedInstance] getAccountCameraUploadFolderPath:_activeUrl];
     

iOSClient/Networking/OCNetworking.m

@@ -253,7 +253,6 @@
     
     [communication getRemoteThumbnailByServer:[_activeUrl stringByAppendingString:@"/"] ofFilePath:_metadataNet.fileName withWidth:width andHeight:height onCommunication:communication successRequest:^(NSHTTPURLResponse *response, NSData *thumbnail, NSString *redirectedServer) {
         
-        //TableAccount *recordAccount = [CCCoreData getActiveAccount];
         tableAccount *recordAccount = [[NCManageDatabase sharedInstance] getAccountActive];
         
         if ([recordAccount.account isEqualToString:_metadataNet.account] && [thumbnail length] > 0) {