clear code

iOSClient/AppDelegate.m

@@ -1496,7 +1496,7 @@
 
     // Refresh
     if (_activeMain && [_listChangeTask count] == 0) {
-        [_activeMain reloadDatasource:serverUrl selector:nil];
+        [_activeMain reloadDatasource:serverUrl];
     }
 }
 

iOSClient/Favorites/CCFavorites.m

@@ -585,7 +585,7 @@
     return metadata;
 }
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl
+- (void)readFolder:(NSString *)serverUrl
 {
     [self reloadDatasource];
 }

iOSClient/Local storage/CCLocalStorage.m

@@ -268,7 +268,7 @@
     return [CCUtility insertFileSystemInMetadata:[dataSource objectAtIndex:indexPath.row] directory:_serverUrl activeAccount:app.activeAccount autoUploadFileName:autoUploadFileName autoUploadDirectory:AutoUploadDirectory];
 }
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl
+- (void)readFolder:(NSString *)serverUrl
 {
     [self reloadDatasource];
 }

iOSClient/Main/CCMain.h

@@ -79,7 +79,7 @@
 
 - (void)createFolderAutoUpload;
 - (void)createFolder:(NSString *)fileNameFolder autoUploadDirectory:(BOOL)autoUploadDirectory;
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 - (void)uploadFileAsset:(NSMutableArray *)assets serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated useSubFolder:(BOOL)useSubFolder session:(NSString *)session;
 
@@ -88,7 +88,7 @@
 - (void)stopTaskButton:(tableMetadata *)metadata;
 
 - (void)reloadDatasource;
-- (void)reloadDatasource:(NSString *)serverUrl selector:(NSString *)selector;
+- (void)reloadDatasource:(NSString *)serverUrl;
 
 - (void)requestServerCapabilities;
 - (void)middlewarePing;

iOSClient/Main/CCMain.m

@@ -176,7 +176,7 @@
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
         
         // Load Datasource
-        [self reloadDatasource:_serverUrl selector:nil];
+        [self reloadDatasource:_serverUrl];
         
         // Read (File) Folder
         [self readFileReloadFolder];
@@ -255,7 +255,7 @@
         if (app.activeAccount.length > 0) {
             
             // Load Datasource
-            [self reloadDatasource:_serverUrl selector:nil];
+            [self reloadDatasource:_serverUrl];
             
             // Read (file) Folder
             [self readFileReloadFolder];
@@ -364,7 +364,7 @@
         [app settingThemingColorBrand];
         
         // Load Datasource
-        [self reloadDatasource:_serverUrl selector:nil];
+        [self reloadDatasource:_serverUrl];
 
         // Read (File) Folder
         [self readFileReloadFolder];
@@ -389,7 +389,7 @@
     } else {
         
         // reload datasource
-        [self reloadDatasource:_serverUrl selector:nil];
+        [self reloadDatasource:_serverUrl];
     }
 }
 
@@ -498,7 +498,7 @@
 
 - (void)refreshControlTarget
 {
-    [self readFolderWithForced:YES serverUrl:_serverUrl];
+    [self readFolder:_serverUrl];
     
     // Actuate `Peek` feedback (weak boom)
     AudioServicesPlaySystemSound(1519);
@@ -1012,7 +1012,7 @@
 
 - (void) loginSuccess:(NSInteger)loginType
 {
-    [self readFolderWithForced:YES serverUrl:_serverUrl];
+    [self readFolder:_serverUrl];
 }
 
 - (void)changePasswordAccount
@@ -1398,7 +1398,7 @@
             [app messageNotification:@"_download_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
     }
 
-    [self reloadDatasource:serverUrl selector:selector];
+    [self reloadDatasource:serverUrl];
 }
 
 - (void)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
@@ -1410,12 +1410,12 @@
     
     // Download
     if ([selector isEqualToString:selectorDownloadFile]) {
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
     }
     
     // Synchronized
     if ([selector isEqualToString:selectorDownloadSynchronize]) {
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
     }
     
     // add Favorite
@@ -1436,7 +1436,7 @@
     // open View File
     if ([selector isEqualToString:selectorLoadFileView] && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
         
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
         
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_compress]) {
             
@@ -1466,13 +1466,13 @@
         
         [app messageNotification:@"_add_local_" description:@"_file_saved_local_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess errorCode:0];
         
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
     }
     
     // Open with...
     if ([selector isEqualToString:selectorOpenIn] && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
         
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
         
         [[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];
@@ -1517,13 +1517,13 @@
             }
         }
         
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
     }
     
     // Copy File
     if ([selector isEqualToString:selectorLoadCopy]) {
         
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
         
         [self copyFileToPasteboard:metadata];
     }
@@ -1538,7 +1538,7 @@
         
         [self openModel:metadata.model isNew:false];
     
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
     }
     
     //download file plist
@@ -1557,7 +1557,7 @@
             if ((countSelectorLoadPlist == 0 || countSelectorLoadPlist % k_maxConcurrentOperation == 0) && [metadata.directoryID isEqualToString:[[NCManageDatabase sharedInstance] getDirectoryID:_serverUrl]]) {
             
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    [self reloadDatasource:serverUrl selector:selector];
+                    [self reloadDatasource:serverUrl];
                 });
             }
         });
@@ -1574,7 +1574,7 @@
         if (app.activePhotos)
             [app.activePhotos downloadFileSuccess:metadata];
 
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
     }
     
     // if exists postselector call self with selectorPost
@@ -1678,7 +1678,7 @@
         [app messageNotification:@"_upload_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
     }
     
-    [self reloadDatasource:serverUrl selector:selector];
+    [self reloadDatasource:serverUrl];
 }
 
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
@@ -1700,11 +1700,11 @@
     
     if ([selectorPost isEqualToString:selectorReadFolderForced] ) {
             
-        [self readFolderWithForced:YES serverUrl:serverUrl];
+        [self readFolder:serverUrl];
             
     } else {
     
-        [self reloadDatasource:serverUrl selector:selector];
+        [self reloadDatasource:serverUrl];
     }
 }
 
@@ -1805,7 +1805,7 @@
 {
     // Read Folder
     if ([metadataNet.selector isEqualToString:selectorReadFileReloadFolder]) {
-        [self readFolderWithForced:NO serverUrl:metadataNet.serverUrl];
+        //[self readFolderWithForced:NO serverUrl:metadataNet.serverUrl];
     }
     
     // UploadFile
@@ -1850,7 +1850,7 @@
         tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"account = %@ AND serverUrl = %@", metadataNet.account, metadataNet.serverUrl]];
         
         if ([metadata.etag isEqualToString:directory.etag] == NO) {
-            [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
+            [self readFolder:metadataNet.serverUrl];
         }
     }
     
@@ -1900,7 +1900,7 @@
     if (message && [record.account isEqualToString:metadataNet.account])
         [app messageNotification:@"_error_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
     
-    [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
+    [self reloadDatasource:metadataNet.serverUrl];
     
     if (errorCode == 401)
         [self changePasswordAccount];
@@ -1992,13 +1992,13 @@
     
     // Search Mode
     if (_isSearchMode)
-        [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl];
 
     // this is the same directory
     if ([metadataNet.serverUrl isEqualToString:_serverUrl] && !_isSearchMode) {
         
         // reload
-        [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl];
     
         // stoprefresh
         [_refreshControl endRefreshing];
@@ -2010,7 +2010,7 @@
     }
 }
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl
+- (void)readFolder:(NSString *)serverUrl
 {
     // init control
     if (!serverUrl || !app.activeAccount || app.maintenanceMode) {
@@ -2024,55 +2024,30 @@
     // Search Mode
     if (_isSearchMode) {
         
-        if (forced) {
+        [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:serverUrl directoryID:nil];
             
-            [[NCManageDatabase sharedInstance] clearDateReadWithServerUrl:serverUrl directoryID:nil];
-            
-            _searchFileName = @"";                          // forced reload searchg
-        }
+        _searchFileName = @"";                          // forced reload searchg
         
         [self updateSearchResultsForSearchController:self.searchController];
         
         return;
     }
+
+    if (_refreshControl.isRefreshing == NO)
+        [_hud visibleIndeterminateHud];
     
-    BOOL isDirectoryOutOfDate = true;
     tableDirectory *directory = [[NCManageDatabase sharedInstance] getTableDirectoryWithPredicate:[NSPredicate predicateWithFormat:@"serverUrl = %@", serverUrl]];
     
-    if (directory.dateReadDirectory) {
-    
-        // Is Directory Out Of Date ?
-        NSDateComponents *dateComponents = [NSDateComponents new];
-        [dateComponents setWeekday:k_dayForceReadFolder];
-        NSCalendar *calendar = [NSCalendar currentCalendar];
-    
-        NSDate *datePlus = [calendar dateByAddingComponents:dateComponents toDate:directory.dateReadDirectory options:0];
-        NSDate *now = [NSDate date];
-    
-        // usa la Cache se richiesto e se la data è entro X giorni dall'ultima volta che l'hai letta.
-        if ([now compare:datePlus] == NSOrderedDescending)
-            isDirectoryOutOfDate = true;
-        else
-            isDirectoryOutOfDate = false;
+    CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
 
-    }
+    metadataNet.action = actionReadFolder;
+    metadataNet.date = [NSDate date];
+    metadataNet.directoryID = directory.directoryID;
+    metadataNet.priority = NSOperationQueuePriorityHigh;
+    metadataNet.selector = selectorReadFolder;
+    metadataNet.serverUrl = serverUrl;
     
-    if (isDirectoryOutOfDate || forced) {
-        
-        if (_refreshControl.isRefreshing == NO)
-            [_hud visibleIndeterminateHud];
-        
-        CCMetadataNet *metadataNet = [[CCMetadataNet alloc] initWithAccount:app.activeAccount];
-        
-        metadataNet.action = actionReadFolder;
-        metadataNet.date = [NSDate date];
-        metadataNet.directoryID = directory.directoryID;
-        metadataNet.priority = NSOperationQueuePriorityHigh;
-        metadataNet.selector = selectorReadFolder;
-        metadataNet.serverUrl = serverUrl;
-
-        [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
-    }
+    [app addNetworkingOperationQueue:app.netQueue delegate:self metadataNet:metadataNet];
 }
 
 #pragma mark -
@@ -2138,7 +2113,7 @@
 {
     [self cancelSearchBar];
     
-    [self readFolderWithForced:NO serverUrl:_serverUrl];
+    [self readFolder:_serverUrl];
 }
 
 - (void)searchFailure:(CCMetadataNet *)metadataNet message:(NSString *)message errorCode:(NSInteger)errorCode
@@ -2209,9 +2184,9 @@
         [_hud hideHud];
         
         if (_isSearchMode)
-            [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
+            [self readFolder:metadataNet.serverUrl];
         else
-            [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
+            [self reloadDatasource:metadataNet.serverUrl];
         
         // next
         if ([_selectedMetadatas count] > 0) {
@@ -2272,7 +2247,7 @@
 
 - (void)renameSuccess:(CCMetadataNet *)metadataNet
 {
-    [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
+    [self readFolder:metadataNet.serverUrl];
 }
 
 - (void)renameFile:(NSArray *)arguments
@@ -2362,7 +2337,7 @@
     
         // reload Datasource
         if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced] || _isSearchMode)
-            [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
+            [self readFolder:metadataNet.serverUrl];
         else
             [self reloadDatasource];
 
@@ -2506,9 +2481,9 @@
     
     // Load Folder or the Datasource
     if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced]) {
-        [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
+        [self readFolder:metadataNet.serverUrl];
     } else {
-        [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl];
     }
 }
 
@@ -3230,9 +3205,9 @@
     [[NCManageDatabase sharedInstance] setMetadataFavoriteWithFileID:metadataNet.fileID favorite:[metadataNet.options boolValue]];
     
     if (_isSearchMode)
-        [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
+        [self readFolder:metadataNet.serverUrl];
     else
-        [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl];
     
     
     tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataNet.fileID]];
@@ -3318,7 +3293,7 @@
     
     [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID] error:nil];
     
-    [self reloadDatasource:serverUrl selector:nil];
+    [self reloadDatasource:serverUrl];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -4079,7 +4054,7 @@
                     // scriviamo il passcode
                     [CCUtility setKeyChainPasscodeForUUID:_metadata.uuid conPasscode:aPasscode];
                     
-                    [self readFolderWithForced:YES serverUrl:_serverUrl];
+                    [self readFolder:_serverUrl];
                     
                 } else {
                     
@@ -4380,7 +4355,7 @@
                                         if (app.activeAccount.length > 0 && app.activePhotos)
                                             [app.activePhotos reloadDatasourceForced];
                                         
-                                        [self readFolderWithForced:YES serverUrl:serverUrl];
+                                        [self readFolder:serverUrl];
                                         
                                         NSLog(@"[LOG] Update Folder Photo");
                                         NSString *autoUploadPath = [[NCManageDatabase sharedInstance] getAccountAutoUploadPath:app.activeUrl];
@@ -4726,10 +4701,10 @@
 
 - (void)reloadDatasource
 {
-    [self reloadDatasource:_serverUrl selector:nil];
+    [self reloadDatasource:_serverUrl];
 }
 
-- (void)reloadDatasource:(NSString *)serverUrl selector:(NSString *)selector
+- (void)reloadDatasource:(NSString *)serverUrl
 {
     // test
     if (app.activeAccount.length == 0 || serverUrl.length == 0)
@@ -4738,15 +4713,8 @@
     // Search Mode
     if(_isSearchMode) {
         
-        if ([selector length] == 0 || [selector isEqualToString:selectorSearch]) {
-        
-            _sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:_searchResultMetadatas listProgressMetadata:nil groupByField:_directoryGroupBy replaceDateToExifDate:NO activeAccount:app.activeAccount];
-            
-        } else {
-            
-            [self readFolderWithForced:NO serverUrl:serverUrl];
-        }
-        
+        _sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:_searchResultMetadatas listProgressMetadata:nil groupByField:_directoryGroupBy replaceDateToExifDate:NO activeAccount:app.activeAccount];
+
         [self tableViewReload];
         
         if ([_sectionDataSource.allRecordsDataSource count] == 0 && [_searchFileName length] >= k_minCharsSearch) {

iOSClient/Networking/CCNetworking.h

@@ -74,7 +74,7 @@
 
 @protocol CCNetworkingDelegate <NSObject>
 
-@optional - (void)reloadDatasource:(NSString *)serverUrl selector:(NSString *)selector;
+@optional - (void)reloadDatasource:(NSString *)serverUrl;
 
 @optional - (void)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost;
 @optional - (void)downloadFileFailure:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector message:(NSString *)message errorCode:(NSInteger)errorCode;

iOSClient/Networking/CCNetworking.m

@@ -651,8 +651,8 @@
     
     dispatch_async(dispatch_get_main_queue(), ^{
         // Refresh datasource if is not a Plist
-        if ([_delegate respondsToSelector:@selector(reloadDatasource:selector:)] && [CCUtility isCryptoPlistString:fileName] == NO)
-            [_delegate reloadDatasource:serverUrl selector:selector];
+        if ([_delegate respondsToSelector:@selector(reloadDatasource:)] && [CCUtility isCryptoPlistString:fileName] == NO)
+            [_delegate reloadDatasource:serverUrl];
         
 #ifndef EXTENSION
         [app updateApplicationIconBadgeNumber];
@@ -1356,8 +1356,8 @@
 
     dispatch_async(dispatch_get_main_queue(), ^{
         // refresh main
-        if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
-            [self.delegate reloadDatasource:serverUrl selector:selector];
+        if ([self.delegate respondsToSelector:@selector(reloadDatasource:)])
+            [self.delegate reloadDatasource:serverUrl];
         
 #ifndef EXTENSION
         [app updateApplicationIconBadgeNumber];
@@ -1581,8 +1581,8 @@
                     [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:[NSString stringWithFormat:@"%@", @k_CCErrorTaskDownloadNotFound] sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:k_taskIdentifierError sessionTaskIdentifierPlist:k_taskIdentifierNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@ ", metadata.fileID]];
                 
                     dispatch_async(dispatch_get_main_queue(), ^{
-                        if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
-                            [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID] selector:nil];
+                        if ([self.delegate respondsToSelector:@selector(reloadDatasource:)])
+                            [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID]];
                     });
                 }
             
@@ -1594,8 +1594,8 @@
                     [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierNULL sessionTaskIdentifierPlist:k_taskIdentifierDone predicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadata.fileID]];
                     
                     dispatch_async(dispatch_get_main_queue(), ^{
-                        if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
-                            [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID] selector:nil];
+                        if ([self.delegate respondsToSelector:@selector(reloadDatasource:)])
+                            [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID]];
                     });
                 }
             });
@@ -1627,8 +1627,8 @@
     
     dispatch_async(dispatch_get_main_queue(), ^{
         for (NSString *serverUrl in serversUrl)
-            if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
-                [self.delegate reloadDatasource:serverUrl selector:nil];
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:)])
+                [self.delegate reloadDatasource:serverUrl];
     });
 }
 
@@ -1704,8 +1704,8 @@
     
     dispatch_async(dispatch_get_main_queue(), ^{
         for (NSString *directoryID in directoryIDs)
-            if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
-                [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:directoryID] selector:nil];
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:)])
+                [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:directoryID]];
     });
 }
 
@@ -1750,8 +1750,8 @@
         NSLog(@"[LOG] Verify read file success, but files already processed");
         
         dispatch_async(dispatch_get_main_queue(), ^{
-            if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
-                [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:directoryID] selector:metadataNet.selector];
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:)])
+                [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:directoryID]];
         });
         
     } else {

iOSClient/Share/CCShareOC.h

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

iOSClient/Share/CCShareOC.m

@@ -446,7 +446,7 @@
     [self.tableView endEditing:YES];
     
     // reload delegate
-    [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID] selector:nil];
+    [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID]];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }

iOSClient/Shares/NCShares.m

@@ -265,7 +265,7 @@
     return metadata;
 }
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl
+- (void)readFolder:(NSString *)serverUrl
 {
     [self reloadDatasource];
 }

iOSClient/Synchronize/CCSynchronize.m

@@ -83,7 +83,7 @@
     if (errorCode == 404 && [recordAccount.account isEqualToString:metadataNet.account]) {
         
         [[NCManageDatabase sharedInstance] deleteDirectoryAndSubDirectoryWithServerUrl:metadataNet.serverUrl];
-        [app.activeMain reloadDatasource:metadataNet.serverUrl selector:nil];
+        [app.activeMain reloadDatasource:metadataNet.serverUrl];
     }
 }
 
@@ -147,7 +147,7 @@
         
         dispatch_async(dispatch_get_main_queue(), ^{
             if ([metadatasNotPresents count] > 0)
-                [app.activeMain reloadDatasource:metadataNet.serverUrl selector:nil];
+                [app.activeMain reloadDatasource:metadataNet.serverUrl];
         });
         
         // ----- Test : (MODIFY) -----
@@ -253,7 +253,7 @@
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataNet.account, metadataNet.fileID] clearDateReadDirectoryID:nil];
         
         NSString *serverUrl = [[NCManageDatabase sharedInstance] getServerUrl:metadataNet.directoryID];
-        [app.activeMain reloadDatasource:serverUrl selector:nil];
+        [app.activeMain reloadDatasource:serverUrl];
     }
 }
 
@@ -377,7 +377,7 @@
     }
     
     dispatch_async(dispatch_get_main_queue(), ^{
-        [app.activeMain reloadDatasource:serverUrl selector:nil];
+        [app.activeMain reloadDatasource:serverUrl];
     });
 }
 

iOSClient/Templates/CCAccountWeb.h

@@ -28,7 +28,7 @@
 
 @protocol CCAccountWebDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCAccountWeb.m

@@ -198,7 +198,7 @@
         // remove the file
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID] clearDateReadDirectoryID:nil];
         
-        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
+        [self.delegate readFolder:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCBancomat.h

@@ -28,7 +28,7 @@
 
 @protocol CCBancomatDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCBancomat.m

@@ -205,7 +205,7 @@
         // remove the file
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID] clearDateReadDirectoryID:nil];
         
-        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
+        [self.delegate readFolder:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCCartaDiCredito.h

@@ -28,7 +28,7 @@
 
 @protocol CCCartaDiCreditoDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCCartaDiCredito.m

@@ -223,7 +223,7 @@
         // remove the file
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID] clearDateReadDirectoryID:nil];
         
-        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
+        [self.delegate readFolder:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCCartaIdentita.h

@@ -28,7 +28,7 @@
 
 @protocol CCCartaIdentitaDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCCartaIdentita.m

@@ -221,7 +221,7 @@
         // remove the file
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID] clearDateReadDirectoryID:nil];
         
-        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
+        [self.delegate readFolder:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCContoCorrente.h

@@ -28,7 +28,7 @@
 
 @protocol CCContoCorrenteDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCContoCorrente.m

@@ -221,7 +221,7 @@
         // remove the file
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID] clearDateReadDirectoryID:nil];
         
-        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
+        [self.delegate readFolder:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCNote.h

@@ -28,7 +28,7 @@
 
 @protocol CCNoteDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCNote.m

@@ -167,7 +167,7 @@
         // remove the file
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID] clearDateReadDirectoryID:nil];
         
-        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
+        [self.delegate readFolder:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCPassaporto.h

@@ -28,7 +28,7 @@
 
 @protocol CCPassaportoDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCPassaporto.m

@@ -221,7 +221,7 @@
         // remove the file
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID] clearDateReadDirectoryID:nil];
         
-        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
+        [self.delegate readFolder:self.serverUrl];
     }
 }
 

iOSClient/Templates/CCPatenteGuida.h

@@ -28,7 +28,7 @@
 
 @protocol CCPatenteGuidaDelegate <NSObject>
 
-- (void)readFolderWithForced:(BOOL)forced serverUrl:(NSString *)serverUrl;
+- (void)readFolder:(NSString *)serverUrl;
 
 @end
 

iOSClient/Templates/CCPatenteGuida.m

@@ -215,7 +215,7 @@
         // remove the file
         [[NCManageDatabase sharedInstance] deleteMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID] clearDateReadDirectoryID:nil];
         
-        [self.delegate readFolderWithForced:YES serverUrl:self.serverUrl];
+        [self.delegate readFolder:self.serverUrl];
     }
 }