change function name for datasource

iOSClient/AppDelegate.m

@@ -295,7 +295,7 @@
     
     // refresh active Main
     if (_activeMain)
-        [_activeMain getDataSourceWithReloadTableView];
+        [_activeMain reloadDatasource];
     
     // Initializations
     [self applicationInitialized];
@@ -343,8 +343,6 @@
     // now
     dispatch_async(dispatch_get_main_queue(), ^{
         
-        //NSLog(@"[LOG] Read Folder for change Rev");
-        //[[NSNotificationCenter defaultCenter] postNotificationName:@"readFileSelfFolderRev" object:nil];
     });
 
     // 0.5 sec.
@@ -1321,8 +1319,9 @@
         [_activeDetail progressTask:nil serverUrl:nil cryptated:NO progress:0];
     
     // Refresh
-    if (_activeMain && [_listChangeTask count] == 0)
-        [_activeMain getDataSourceWithReloadTableView:metadata.directoryID fileID:nil selector:nil];
+    if (_activeMain && [_listChangeTask count] == 0) {
+        [_activeMain reloadDatasource:[CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account] fileID:nil selector:nil];
+    }
 }
 
 - (void)dropAutomaticUploadWithSelector:(NSString *)selector

iOSClient/Main/CCMain.h

@@ -65,7 +65,6 @@
 @interface CCMain : UITableViewController <UITableViewDataSource, UITableViewDelegate, UIActionSheetDelegate, UIGestureRecognizerDelegate, UIDocumentInteractionControllerDelegate, UIViewControllerPreviewingDelegate, CCMoveDelegate, CTAssetsPickerControllerDelegate, BKPasscodeViewControllerDelegate, UISplitViewControllerDelegate, UIPopoverControllerDelegate, CCNetworkingDelegate, CCShareOCDelegate, CCAccountWebDelegate, CCBancomatDelegate, CCCartaDiCreditoDelegate, CCCartaIdentitaDelegate, CCContoCorrenteDelegate, CCNoteDelegate, CCPassaportoDelegate, CCPatenteGuidaDelegate, CCPeekPopDelegate, UIDocumentMenuDelegate, UIDocumentPickerDelegate, UISearchResultsUpdating, UISearchControllerDelegate, UISearchBarDelegate>
 
 @property (nonatomic ,strong) NSString *serverUrl;
-@property (nonatomic ,strong) NSString *directoryID;
 
 @property BOOL isFolderEncrypted;
 @property (nonatomic, weak) NSString *titleMain;
@@ -91,8 +90,8 @@
 - (void)cancelTaskButton:(CCMetadata *)metadata reloadTable:(BOOL)reloadTable;
 - (void)stopTaskButton:(CCMetadata *)metadata;
 
-- (void)getDataSourceWithReloadTableView;
-- (void)getDataSourceWithReloadTableView:(NSString *)directoryID fileID:(NSString *)fileID selector:(NSString *)selector;
+- (void)reloadDatasource;
+- (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
 
 - (void)requestSharedByServer;
 - (void)requestServerInformation;

iOSClient/Main/CCMain.m

@@ -98,10 +98,6 @@
 
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setTitleNOAnimation) name:@"setTitleCCMainNOAnimation" object:nil];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setTitleYESAnimation) name:@"setTitleCCMainYESAnimation" object:nil];
-        
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(readFileSelfFolderRev) name:@"readFileSelfFolderRev" object:nil];
-        
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getDataSourceWithReloadTableView) name:@"getDataSourceWithReloadTableView" object:nil];
     }
     
     return self;
@@ -166,10 +162,9 @@
         
         // Settings this folder & delegate & Loading datasource
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
-        _directoryID = [CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount];
         
         // Load Datasource
-        [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+        [self reloadDatasource:_serverUrl fileID:nil selector:nil];
         
         // Read Folder
         [self readFolderWithForced:NO];
@@ -198,7 +193,6 @@
     // Settings this folder & delegate & Loading datasource
     if (app.activeAccount) {
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
-        _directoryID = [CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount];
     }
     [[CCNetworking sharedNetworking] settingDelegate:self];
     
@@ -235,7 +229,7 @@
         if (app.activeAccount) {
             
             // Load Datasource
-            [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+            [self reloadDatasource:_serverUrl fileID:nil selector:nil];
             
             // Read Folder
             [self readFolderWithForced:NO];
@@ -298,7 +292,6 @@
         [self.navigationController popToRootViewControllerAnimated:NO];
         
         _serverUrl = [CCUtility getHomeServerUrlActiveUrl:app.activeUrl typeCloud:app.typeCloud];
-        _directoryID = [CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount];
         _isFolderEncrypted = NO;
         
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
@@ -314,7 +307,7 @@
         [CCCoreData populateSharesVariableFromDBActiveAccount:app.activeAccount sharesLink:app.sharesLink sharesUserAndGroup:app.sharesUserAndGroup];
         
         // Load Datasource
-        [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+        [self reloadDatasource:_serverUrl fileID:nil selector:nil];
 
         // Load Folder
         [self readFolderWithForced:NO];
@@ -339,7 +332,7 @@
     } else {
         
         // reload datasource
-        [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+        [self reloadDatasource:_serverUrl fileID:nil selector:nil];
     }
 }
 
@@ -372,7 +365,7 @@
         
         [[CCOfflineFileFolder sharedOfflineFileFolder] addOfflineFolder:dir];
         
-        [self performSelector:@selector(getDataSourceWithReloadTableView) withObject:nil afterDelay:0.1];
+        [self performSelector:@selector(reloadDatasource) withObject:nil afterDelay:0.1];
     }
 }
 
@@ -1242,7 +1235,7 @@
             [app messageNotification:@"_download_file_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
     }
 
-    [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+    [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
 }
 
 - (void)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
@@ -1253,19 +1246,19 @@
 
     // reload
     if ([selector isEqualToString:selectorReload]) {
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
     
     // Offline Directory
     if ([selector isEqualToString:selectorDownloadOffline]) {
         
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
     
     // add Offline
     if ([selector isEqualToString:selectorAddOffline] && ![CCCoreData isOfflineDirectoryServerUrl:serverUrl activeAccount:app.activeAccount]) {
         [CCCoreData setOfflineLocalFileID:metadata.fileID offline:YES activeAccount:app.activeAccount];
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
     
     // encrypted file
@@ -1281,7 +1274,7 @@
     // open View File
     if ([selector isEqualToString:selectorLoadFileView] && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
         
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
         
         if ([metadata.typeFile isEqualToString:metadataTypeFile_compress]) {
             
@@ -1311,13 +1304,13 @@
         
         [app messageNotification:@"_add_local_" description:@"_file_saved_local_" visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeSuccess];
         
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
     
     // Open with...
     if ([selector isEqualToString:selectorOpenIn] && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
         
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
         
         [[NSFileManager defaultManager] removeItemAtPath:[NSTemporaryDirectory() stringByAppendingString:metadata.fileNamePrint] error:nil];
         [[NSFileManager defaultManager] linkItemAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID] toPath:[NSTemporaryDirectory() stringByAppendingString:metadata.fileNamePrint] error:nil];
@@ -1362,13 +1355,13 @@
             }
         }
         
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
     
     // Copy File
     if ([selector isEqualToString:selectorLoadCopy]) {
         
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
         
         [self copyFileToPasteboard:metadata];
     }
@@ -1380,7 +1373,7 @@
         
         [self openModel:metadata.model isNew:false];
         
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
     
     //download file plist
@@ -1398,10 +1391,10 @@
             }
         }
         
-        if ((countSelectorLoadPlist == 0 || countSelectorLoadPlist % maxConcurrentOperation == 0) && [metadata.directoryID isEqualToString:_directoryID]) {
+        if ((countSelectorLoadPlist == 0 || countSelectorLoadPlist % maxConcurrentOperation == 0) && [metadata.directoryID isEqualToString:[CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount]]) {
             
             dispatch_async(dispatch_get_main_queue(), ^{
-                [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+                [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
             });
         }
     }
@@ -1420,7 +1413,7 @@
                 [app.activePhotosCameraUpload downloadFileSuccess:metadata];
         });
 
-        [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
     }
     
     // if exists postselector call self with selectorPost
@@ -1499,7 +1492,7 @@
         [app messageNotification:@"_upload_file_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
     }
     
-    [self getDataSourceWithReloadTableView:[CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount] fileID:nil selector:selector];
+    [self reloadDatasource:serverUrl fileID:nil selector:selector];
 }
 
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
@@ -1514,7 +1507,7 @@
             
     } else {
     
-        [self getDataSourceWithReloadTableView:[CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount] fileID:nil selector:selector];
+        [self reloadDatasource:serverUrl fileID:nil selector:selector];
     }
 }
 
@@ -1709,21 +1702,6 @@
     }
 }
 
-- (void)readFileSelfFolderRev
-{
-    // test
-    if ([app.activeAccount length] == 0 || [_directoryID length] == 0)
-        return;
-
-    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-
-    metadataNet.action = actionReadFile;
-    metadataNet.selector = selectorReadFileFolder;
-    metadataNet.serverUrl = [CCCoreData getServerUrlFromDirectoryID:_directoryID activeAccount:app.activeAccount];
-
-    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ==== Read Folder ====
 #pragma --------------------------------------------------------------------------------------------
@@ -1742,7 +1720,7 @@
     if (message && [record.account isEqualToString:metadataNet.account])
         [app messageNotification:@"_error_" description:message visible:YES delay:dismissAfterSecond type:TWMessageBarMessageTypeError];
     
-    [self getDataSourceWithReloadTableView:metadataNet.directoryID fileID:nil selector:metadataNet.selector];
+    [self reloadDatasource:metadataNet.serverUrl fileID:nil selector:metadataNet.selector];
     
     if (errorCode == 401)
         [self changePasswordAccount];
@@ -1834,14 +1812,14 @@
     
     // File is changed ??
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
-        [[CCOfflineFileFolder sharedOfflineFileFolder] verifyChangeMedatas:metadatas serverUrl:metadataNet.serverUrl directoryID:metadataNet.directoryID account:app.activeAccount offline:NO];
+        [[CCOfflineFileFolder sharedOfflineFileFolder] verifyChangeMedatas:metadatas serverUrl:metadataNet.serverUrl account:app.activeAccount offline:NO];
     });
 
     // this is the same directory
     if ([metadataNet.serverUrl isEqualToString:_serverUrl]) {
         
         // reload
-        [self getDataSourceWithReloadTableView:metadataNet.directoryID fileID:nil selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl fileID:nil selector:metadataNet.selector];
     
         // stoprefresh
         [_refreshControl endRefreshing];
@@ -1861,7 +1839,9 @@
     if (!_serverUrl || !app.activeAccount)
         return;
     
-    if (([CCCoreData isDirectoryOutOfDate:dayForceReadFolder directoryID:_directoryID activeAccount:app.activeAccount] || forced) && _directoryID && app.activeAccount) {
+    NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount];
+    
+    if (([CCCoreData isDirectoryOutOfDate:dayForceReadFolder directoryID:directoryID activeAccount:app.activeAccount] || forced) && directoryID && app.activeAccount) {
         
         if (_refreshControl.isRefreshing == NO)
             [_hud visibleIndeterminateHud];
@@ -1870,10 +1850,10 @@
         
         metadataNet.action = actionReadFolder;
         metadataNet.date = [NSDate date];
-        metadataNet.directoryID = _directoryID;
+        metadataNet.directoryID = directoryID;
         metadataNet.priority = NSOperationQueuePriorityVeryHigh;
         metadataNet.selector = selectorReadFolder;
-        metadataNet.serverUrl = [CCCoreData getServerUrlFromDirectoryID:_directoryID activeAccount:app.activeAccount];
+        metadataNet.serverUrl = [CCCoreData getServerUrlFromDirectoryID:directoryID activeAccount:app.activeAccount];
 
         [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
         
@@ -1904,7 +1884,7 @@
         if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced]) {
             [self readFolderWithForced:YES];
         } else {
-            [self getDataSourceWithReloadTableView:metadataNet.metadata.directoryID fileID:metadataNet.metadata.fileID selector:metadataNet.selector];
+            [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.metadata.fileID selector:metadataNet.selector];
         }
 
         // next
@@ -2062,7 +2042,7 @@
         if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced])
             [self readFolderWithForced:YES];
         else
-            [self getDataSourceWithReloadTableView];
+            [self reloadDatasource];
 
         // Next file
         [_selectedMetadatas removeObjectAtIndex:0];
@@ -2200,7 +2180,7 @@
     if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced]) {
         [self readFolderWithForced:YES];
     } else {
-        [self getDataSourceWithReloadTableView:_directoryID fileID:metadataNet.fileID selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.fileID selector:metadataNet.selector];
     }
 }
 
@@ -2416,7 +2396,7 @@
                 
         dispatch_async(dispatch_get_main_queue(), ^{
             [[CCNetworking sharedNetworking] uploadFile:metadata.fileName serverUrl:serverUrl cryptated:YES onlyPlist:NO session:upload_session taskStatus:taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
-            [self performSelector:@selector(getDataSourceWithReloadTableView) withObject:nil afterDelay:0.1];
+            [self performSelector:@selector(reloadDatasource) withObject:nil afterDelay:0.1];
         });
         
     } else {
@@ -2438,7 +2418,7 @@
         
         dispatch_async(dispatch_get_main_queue(), ^{
             [[CCNetworking sharedNetworking] uploadFile:metadata.fileNamePrint serverUrl:serverUrl cryptated:NO onlyPlist:NO session:upload_session taskStatus:taskStatusResume selector:nil selectorPost:nil parentRev:nil errorCode:0 delegate:nil];
-            [self performSelector:@selector(getDataSourceWithReloadTableView) withObject:nil afterDelay:0.1];
+            [self performSelector:@selector(reloadDatasource) withObject:nil afterDelay:0.1];
         });
         
     } else {
@@ -2965,7 +2945,7 @@
     [CCUtility setOrderSettings:order];
     
     // refresh
-    [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+    [self reloadDatasource:_serverUrl fileID:nil selector:nil];
     // new menu
     [self createReMainMenu];
 }
@@ -2978,7 +2958,7 @@
     [CCUtility setAscendingSettings:ascending];
     
     // refresh
-    [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+    [self reloadDatasource:_serverUrl fileID:nil selector:nil];
     // new menu
     [self createReMainMenu];
 }
@@ -2991,7 +2971,7 @@
     [CCUtility setDirectoryOnTop:directoryOnTop];
     
     // refresh
-    [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+    [self reloadDatasource:_serverUrl fileID:nil selector:nil];
     // new menu
     [self createReMainMenu];
 }
@@ -3004,7 +2984,7 @@
     [CCUtility setGroupBySettings:groupBy];
     
     // refresh
-    [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+    [self reloadDatasource:_serverUrl fileID:nil selector:nil];
     // new menu
     [self createReMainMenu];
 }
@@ -3971,7 +3951,7 @@
     
     // forse reload
     _dateReadDataSource = nil;
-    [self getDataSourceWithReloadTableView];
+    [self reloadDatasource];
     
 }
 
@@ -4210,7 +4190,7 @@
                                                     [CCCoreData removeOfflineAllFileFromServerUrl:directory.serverUrl activeAccount:app.activeAccount];
                                                 }
                                             
-                                            [self performSelector:@selector(getDataSourceWithReloadTableView) withObject:nil];
+                                            [self performSelector:@selector(reloadDatasource) withObject:nil];
                                         }
                                     }];
         }
@@ -4517,25 +4497,25 @@
     _dateReadDataSource = Nil;
 }
 
-- (void)getDataSourceWithReloadTableView
+- (void)reloadDatasource
 {
-    [self getDataSourceWithReloadTableView:_directoryID fileID:nil selector:nil];
+    [self reloadDatasource:_serverUrl fileID:nil selector:nil];
 }
 
-- (void)getDataSourceWithReloadTableView:(NSString *)directoryID fileID:(NSString *)fileID selector:(NSString *)selector
+- (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector
 {
-    if (app.activeAccount == nil || app.activeUrl == nil || directoryID == nil)
+    if (app.activeAccount == nil || app.activeUrl == nil || serverUrl == nil)
         return;
     
     // Reload -> Self se non siamo nella dir appropriata cercala e se è in memoria reindirizza il reload
-    if ([directoryID isEqualToString:_directoryID] == NO || _serverUrl == nil) {
+    if ([serverUrl isEqualToString:_serverUrl] == NO || _serverUrl == nil) {
         
         if ([selector isEqualToString:selectorDownloadOffline]) {
             [app.controlCenter reloadDatasource];
         } else {
-            CCMain *main = [app.listMainVC objectForKey:[CCCoreData getServerUrlFromDirectoryID:directoryID activeAccount:app.activeAccount]];
+            CCMain *main = [app.listMainVC objectForKey:serverUrl];
             if (main) {
-                [main getDataSourceWithReloadTableView];
+                [main reloadDatasource];
             } else {
                 [self tableViewReload];
                 [app.controlCenter reloadDatasource];
@@ -4555,7 +4535,7 @@
     _directoryOrder = [CCUtility getOrderSettings];
     
     // Controllo data lettura Data Source
-    NSDate *dateDateRecordDirectory = [CCCoreData getDateReadDirectoryID:_directoryID activeAccount:app.activeAccount];
+    NSDate *dateDateRecordDirectory = [CCCoreData getDateReadDirectoryID:[CCCoreData getDirectoryIDFromServerUrl:_serverUrl activeAccount:app.activeAccount] activeAccount:app.activeAccount];
     
     if ([dateDateRecordDirectory compare:_dateReadDataSource] == NSOrderedDescending || dateDateRecordDirectory == nil || _dateReadDataSource == nil) {
         
@@ -4565,7 +4545,7 @@
     
         // Data Source
     
-        NSArray *recordsTableMetadata = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@)", app.activeAccount, directoryID] fieldOrder:[CCUtility getOrderSettings] ascending:[CCUtility getAscendingSettings]];
+        NSArray *recordsTableMetadata = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@)", app.activeAccount, [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount]] fieldOrder:[CCUtility getOrderSettings] ascending:[CCUtility getAscendingSettings]];
     
         _sectionDataSource = [CCSection creataDataSourseSectionTableMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:_directoryGroupBy replaceDateToExifDate:NO activeAccount:app.activeAccount];
         

iOSClient/Networking/CCNetworking.h

@@ -76,7 +76,7 @@
 
 @protocol CCNetworkingDelegate <NSObject>
 
-@optional - (void)getDataSourceWithReloadTableView:(NSString *)directoryID fileID:(NSString *)fileID selector:(NSString *)selector;
+@optional - (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
 @optional - (void)comandoCreaCartella:(NSString *)fileNameFolder cameraUpload:(BOOL)cameraUpload;
 
 @optional - (void)downloadTaskSave:(NSURLSessionDownloadTask *)downloadTask;

iOSClient/Networking/CCNetworking.m

@@ -590,10 +590,8 @@
     dispatch_async(dispatch_get_main_queue(), ^{
     
         // Refresh datasource if is not a Plist
-        NSString *directoryID = [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:_activeAccount];
-        
-        if ([_delegate respondsToSelector:@selector(getDataSourceWithReloadTableView:fileID:selector:)] && [CCUtility isCryptoPlistString:fileName] == NO)
-            [_delegate getDataSourceWithReloadTableView:directoryID fileID:fileID selector:selector];
+        if ([_delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)] && [CCUtility isCryptoPlistString:fileName] == NO)
+            [_delegate reloadDatasource:serverUrl fileID:fileID selector:selector];
     });
 }
 
@@ -879,7 +877,7 @@
         
         [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
         
-        [self uploadURLSession:fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+        [self uploadURLSession:fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
     }
     
     else if (cryptated == YES) {
@@ -911,10 +909,10 @@
             [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
             
             // DATA
-            [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+            [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
             
             // PLIST
-            [self uploadURLSession:[fileNameCrypto stringByAppendingString:@".plist"] fileNamePrint:fileName serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+            [self uploadURLSession:[fileNameCrypto stringByAppendingString:@".plist"] fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
         }
         
         if (template == NO) {
@@ -1006,10 +1004,10 @@
                     [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
                     
                     // DATA
-                    [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+                    [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
                     
                     // PLIST
-                    [self uploadURLSession:[fileNameCrypto stringByAppendingString:@".plist"] fileNamePrint:fileName serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+                    [self uploadURLSession:[fileNameCrypto stringByAppendingString:@".plist"] fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
                 }];
 
                 [alertController addAction:cancelAction];
@@ -1035,10 +1033,10 @@
                 [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
                 
                 // DATA
-                [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+                [self uploadURLSession:fileNameCrypto fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
                 
                 // PLIST
-                [self uploadURLSession:[fileNameCrypto stringByAppendingString:@".plist"] fileNamePrint:fileName serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+                [self uploadURLSession:[fileNameCrypto stringByAppendingString:@".plist"] fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
             }
         }
     }
@@ -1092,7 +1090,7 @@
                 
                 [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
                 
-                [self uploadURLSession:fileName fileNamePrint:fileName serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+                [self uploadURLSession:fileName fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
             }];
             
             [alertController addAction:cancelAction];
@@ -1115,7 +1113,7 @@
 #endif
             [CCCoreData addMetadata:metadata activeAccount:_activeAccount activeUrl:_activeUrl typeCloud:_typeCloud context:_context];
             
-            [self uploadURLSession:fileName fileNamePrint:fileName serverUrl:serverUrl directoryID:metadata.directoryID sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
+            [self uploadURLSession:fileName fileNamePrint:fileName serverUrl:serverUrl sessionID:uploadID session:metadata.session taskStatus:taskStatus assetDate:assetDate assetMediaType:assetMediaType cryptated:cryptated onlyPlist:onlyPlist parentRev:parentRev selector:selector];
         }
     }
 }
@@ -1133,9 +1131,9 @@
         
             send = YES;
             
-            [self uploadURLSession:metadata.fileNameData fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl directoryID:metadata.directoryID sessionID:metadata.sessionID session:metadata.session taskStatus:taskStatus assetDate:nil assetMediaType:0 cryptated:YES onlyPlist:NO parentRev:nil selector:metadata.sessionSelector];
+            [self uploadURLSession:metadata.fileNameData fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl sessionID:metadata.sessionID session:metadata.session taskStatus:taskStatus assetDate:nil assetMediaType:0 cryptated:YES onlyPlist:NO parentRev:nil selector:metadata.sessionSelector];
             
-            [self uploadURLSession:metadata.fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl directoryID:metadata.directoryID sessionID:metadata.sessionID session:metadata.session taskStatus:taskStatus assetDate:nil assetMediaType:PHAssetMediaTypeUnknown cryptated:YES onlyPlist:NO parentRev:nil selector:metadata.sessionSelector];
+            [self uploadURLSession:metadata.fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl sessionID:metadata.sessionID session:metadata.session taskStatus:taskStatus assetDate:nil assetMediaType:PHAssetMediaTypeUnknown cryptated:YES onlyPlist:NO parentRev:nil selector:metadata.sessionSelector];
         }
         
     } else {
@@ -1145,7 +1143,7 @@
             
             send = YES;
             
-            [self uploadURLSession:metadata.fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl directoryID:metadata.directoryID sessionID:metadata.sessionID session:metadata.session taskStatus:taskStatus assetDate:nil assetMediaType:PHAssetMediaTypeUnknown cryptated:NO onlyPlist:NO parentRev:nil selector:metadata.sessionSelector];
+            [self uploadURLSession:metadata.fileName fileNamePrint:metadata.fileNamePrint serverUrl:serverUrl sessionID:metadata.sessionID session:metadata.session taskStatus:taskStatus assetDate:nil assetMediaType:PHAssetMediaTypeUnknown cryptated:NO onlyPlist:NO parentRev:nil selector:metadata.sessionSelector];
         }
     }
     
@@ -1167,7 +1165,7 @@
     }
 }
 
-- (void)uploadURLSession:(NSString *)fileName fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID sessionID:(NSString*)sessionID session:(NSString *)session taskStatus:(NSInteger)taskStatus assetDate:(NSDate *)assetDate assetMediaType:(PHAssetMediaType)assetMediaType cryptated:(BOOL)cryptated onlyPlist:(BOOL)onlyPlist parentRev:(NSString *)parentRev selector:(NSString *)selector
+- (void)uploadURLSession:(NSString *)fileName fileNamePrint:(NSString *)fileNamePrint serverUrl:(NSString *)serverUrl sessionID:(NSString*)sessionID session:(NSString *)session taskStatus:(NSInteger)taskStatus assetDate:(NSDate *)assetDate assetMediaType:(PHAssetMediaType)assetMediaType cryptated:(BOOL)cryptated onlyPlist:(BOOL)onlyPlist parentRev:(NSString *)parentRev selector:(NSString *)selector
 {
     NSURLSession *sessionUpload;
     NSURL *url;
@@ -1263,8 +1261,8 @@
     dispatch_async(dispatch_get_main_queue(), ^{
         
         // refresh main
-        if ([self.delegate respondsToSelector:@selector(getDataSourceWithReloadTableView:fileID:selector:)])
-            [self.delegate getDataSourceWithReloadTableView:directoryID fileID:nil selector:selector];
+        if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
+            [self.delegate reloadDatasource:serverUrl fileID:nil selector:selector];
     });
 }
 
@@ -1483,8 +1481,8 @@
                 
                 dispatch_async(dispatch_get_main_queue(), ^{
                     
-                    if ([self.delegate respondsToSelector:@selector(getDataSourceWithReloadTableView:fileID:selector:)])
-                        [self.delegate getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:nil];
+                    if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
+                        [self.delegate reloadDatasource:[CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account] fileID:metadata.fileID selector:nil];
                 });
                 
             }
@@ -1498,8 +1496,8 @@
                 
                 dispatch_async(dispatch_get_main_queue(), ^{
                     
-                    if ([self.delegate respondsToSelector:@selector(getDataSourceWithReloadTableView:fileID:selector:)])
-                        [self.delegate getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:nil];
+                    if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
+                        [self.delegate reloadDatasource:[CCCoreData getServerUrlFromDirectoryID:metadata.directoryID activeAccount:metadata.account] fileID:metadata.fileID selector:nil];
                 });
             }
             
@@ -1511,7 +1509,7 @@
 
 - (void)automaticDownloadInError
 {
-    NSMutableSet *directoryIDs = [[NSMutableSet alloc] init];
+    NSMutableSet *serversUrl = [[NSMutableSet alloc] init];
     
     NSArray *records = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (session CONTAINS 'download') AND ((sessionTaskIdentifier == %i) OR (sessionTaskIdentifierPlist == %i))", _activeAccount, taskIdentifierError, taskIdentifierError] context:nil];
     
@@ -1529,16 +1527,16 @@
         if (metadata.sessionTaskIdentifierPlist == taskIdentifierError)
             [self downloadFile:metadata serverUrl:serverUrl downloadData:NO downloadPlist:YES selector:metadata.sessionSelector selectorPost:nil session:download_session taskStatus:taskStatusResume delegate:nil];
             
-        [directoryIDs addObject:metadata.directoryID];
+        [serversUrl addObject:serverUrl];
             
         NSLog(@"[LOG] Re download file : %@ - %@ [%i %i]", metadata.fileName, metadata.fileNamePrint, metadata.sessionTaskIdentifier, metadata.sessionTaskIdentifierPlist);
     }
     
     dispatch_async(dispatch_get_main_queue(), ^{
         
-        for (NSString *directoryID in directoryIDs)
-            if ([self.delegate respondsToSelector:@selector(getDataSourceWithReloadTableView:fileID:selector:)])
-                [self.delegate getDataSourceWithReloadTableView:directoryID fileID:nil selector:nil];
+        for (NSString *serverUrl in serversUrl)
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
+                [self.delegate reloadDatasource:serverUrl fileID:nil selector:nil];
     });
 }
 
@@ -1623,8 +1621,8 @@
     dispatch_async(dispatch_get_main_queue(), ^{
         
         for (NSString *directoryID in directoryIDs)
-            if ([self.delegate respondsToSelector:@selector(getDataSourceWithReloadTableView:fileID:selector:)])
-                [self.delegate getDataSourceWithReloadTableView:directoryID fileID:nil selector:nil];
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
+                [self.delegate reloadDatasource:[CCCoreData getServerUrlFromDirectoryID:directoryID activeAccount:_activeAccount] fileID:nil selector:nil];
     });
 }
 
@@ -1670,8 +1668,8 @@
         
         dispatch_async(dispatch_get_main_queue(), ^{
             
-            if ([self.delegate respondsToSelector:@selector(getDataSourceWithReloadTableView:fileID:selector:)])
-                [self.delegate getDataSourceWithReloadTableView:metadataTemp.directoryID fileID:metadataTemp.fileID selector:metadataNet.selector];
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
+                [self.delegate reloadDatasource:[CCCoreData getServerUrlFromDirectoryID:directoryID activeAccount:_activeAccount] fileID:metadataTemp.fileID selector:metadataNet.selector];
         });
         
     } else {

iOSClient/Offline/CCOfflineFileFolder.h

@@ -38,7 +38,7 @@
 
 - (void)readFileOffline;
 
-- (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID account:(NSString *)account offline:(BOOL)offline;
+- (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account offline:(BOOL)offline;
 
 - (BOOL)offlineFolderAnimationDirectory:(NSArray *)directory callViewController:(BOOL)callViewController;
 

iOSClient/Offline/CCOfflineFileFolder.m

@@ -199,7 +199,7 @@
             }
             
             if ([metadatasNotPresents count] > 0)
-                [app.activeMain getDataSourceWithReloadTableView:metadataNet.directoryID fileID:nil selector:nil];
+                [app.activeMain reloadDatasource:metadataNet.serverUrl fileID:nil selector:nil];
             
         });
         
@@ -269,7 +269,7 @@
         }
         
         if ([metadatasForOfflineFolder count] > 0)
-            [self verifyChangeMedatas:metadatasForOfflineFolder serverUrl:metadataNet.serverUrl directoryID:metadataNet.directoryID account:metadataNet.account offline:YES];
+            [self verifyChangeMedatas:metadatasForOfflineFolder serverUrl:metadataNet.serverUrl account:metadataNet.account offline:YES];
     });
 }
 
@@ -322,7 +322,7 @@
 {
     dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_LOW, 0), ^{
         
-        [self verifyChangeMedatas:[[NSArray alloc] initWithObjects:metadata, nil] serverUrl:metadataNet.serverUrl directoryID:metadataNet.directoryID account:app.activeAccount offline:NO];
+        [self verifyChangeMedatas:[[NSArray alloc] initWithObjects:metadata, nil] serverUrl:metadataNet.serverUrl account:app.activeAccount offline:NO];
     });
 }
 
@@ -332,7 +332,7 @@
 
 
 // MULTI THREAD
-- (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID account:(NSString *)account offline:(BOOL)offline
+- (void)verifyChangeMedatas:(NSArray *)allRecordMetadatas serverUrl:(NSString *)serverUrl account:(NSString *)account offline:(BOOL)offline
 {
     NSMutableArray *metadatas = [[NSMutableArray alloc] init];
     BOOL isOfflineDirectory = [CCCoreData isOfflineDirectoryServerUrl:serverUrl activeAccount:app.activeAccount];
@@ -390,12 +390,12 @@
     
     dispatch_async(dispatch_get_main_queue(), ^{
         if ([metadatas count])
-            [self offlineMetadatas:metadatas serverUrl:serverUrl directoryID:directoryID offline:offline];
+            [self offlineMetadatas:metadatas serverUrl:serverUrl offline:offline];
     });
 }
 
 // MAIN THREAD
-- (void)offlineMetadatas:(NSArray *)metadatas serverUrl:(NSString *)serverUrl directoryID:(NSString *)directoryID offline:(BOOL)offline
+- (void)offlineMetadatas:(NSArray *)metadatas serverUrl:(NSString *)serverUrl offline:(BOOL)offline
 {
     // HUD
     if ([metadatas count] > 50 && offline) {
@@ -445,7 +445,7 @@
     
         [[CCOfflineFileFolder sharedOfflineFileFolder] offlineFolderAnimationDirectory:[[NSArray alloc] initWithObjects:serverUrl, nil] callViewController:YES];
         
-        [app.activeMain getDataSourceWithReloadTableView:directoryID fileID:nil selector:nil];
+        [app.activeMain reloadDatasource:serverUrl fileID:nil selector:nil];
         
         [_hud hideHud];
     });

iOSClient/Share/CCShareOC.h

@@ -63,7 +63,7 @@
 - (void)unShare:(NSString *)share metadata:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl;
 - (void)updateShare:(NSString *)share metadata:(CCMetadata *)metadata serverUrl:(NSString *)serverUrl password:(NSString *)password expirationTime:(NSString *)expirationTime permission:(NSInteger)permission;
 
-- (void)getDataSourceWithReloadTableView:(NSString *)directoryID fileID:(NSString *)fileID selector:(NSString *)selector;
+- (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
 - (void)getUserAndGroup:(NSString *)find;
 - (void)shareUserAndGroup:(NSString *)user shareeType:(NSInteger)shareeType permission:(NSInteger)permission metadata:(CCMetadata *)metadata directoryID:(NSString *)directoryID serverUrl:(NSString *)serverUrl;
 

iOSClient/Share/CCShareOC.m

@@ -450,7 +450,7 @@
     [self.tableView endEditing:YES];
     
     // reload delegate
-    [self.delegate getDataSourceWithReloadTableView:self.metadata.directoryID fileID:nil selector:nil];
+    [self.delegate reloadDatasource:[CCCoreData getServerUrlFromDirectoryID:self.metadata.directoryID activeAccount:self.metadata.account] fileID:nil selector:nil];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }