clear code

iOSClient/AppDelegate.m

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

iOSClient/Main/CCMain.h

@@ -88,7 +88,7 @@
 - (void)stopTaskButton:(tableMetadata *)metadata;
 
 - (void)reloadDatasource;
-- (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
+- (void)reloadDatasource:(NSString *)serverUrl selector:(NSString *)selector;
 
 - (void)requestServerCapabilities;
 - (void)middlewarePing;

iOSClient/Main/CCMain.m

@@ -178,7 +178,7 @@
         app.directoryUser = [CCUtility getDirectoryActiveUser:app.activeUser activeUrl:app.activeUrl];
         
         // Load Datasource
-        [self reloadDatasource:_serverUrl fileID:nil selector:nil];
+        [self reloadDatasource:_serverUrl selector:nil];
         
         // Read Folder
         [self readFolderWithForced:NO serverUrl:_serverUrl];
@@ -257,7 +257,7 @@
         if (app.activeAccount.length > 0) {
             
             // Load Datasource
-            [self reloadDatasource:_serverUrl fileID:nil selector:nil];
+            [self reloadDatasource:_serverUrl selector:nil];
             
             // Read Folder
             [self readFolderWithForced:NO serverUrl:_serverUrl];
@@ -366,7 +366,7 @@
         [app settingThemingColorBrand];
         
         // Load Datasource
-        [self reloadDatasource:_serverUrl fileID:nil selector:nil];
+        [self reloadDatasource:_serverUrl selector:nil];
 
         // Load Folder
         [self readFolderWithForced:NO serverUrl:_serverUrl];
@@ -391,7 +391,7 @@
     } else {
         
         // reload datasource
-        [self reloadDatasource:_serverUrl fileID:nil selector:nil];
+        [self reloadDatasource:_serverUrl selector:nil];
     }
 }
 
@@ -1400,29 +1400,28 @@
             [app messageNotification:@"_download_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
     }
 
-    [self reloadDatasource:serverUrl fileID:fileID selector:selector];
+    [self reloadDatasource:serverUrl selector:selector];
 }
 
 - (void)downloadFileSuccess:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
 {
     __block tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
     
-    if (metadata == nil) return;
+    if (metadata == nil)
+        return;
     
     // Download
     if ([selector isEqualToString:selectorDownloadFile]) {
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
     }
     
     // Synchronized
     if ([selector isEqualToString:selectorDownloadSynchronize]) {
-        
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
     }
     
     // add Favorite
     if ([selector isEqualToString:selectorAddFavorite]) {
-        
         [[CCActions sharedInstance] settingFavorite:metadata favorite:YES delegate:self];
     }
     
@@ -1439,7 +1438,7 @@
     // open View File
     if ([selector isEqualToString:selectorLoadFileView] && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
         
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
         
         if ([metadata.typeFile isEqualToString: k_metadataTypeFile_compress]) {
             
@@ -1469,13 +1468,13 @@
         
         [app messageNotification:@"_add_local_" description:@"_file_saved_local_" visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeSuccess errorCode:0];
         
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
     }
     
     // Open with...
     if ([selector isEqualToString:selectorOpenIn] && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
         
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl 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];
@@ -1520,13 +1519,13 @@
             }
         }
         
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
     }
     
     // Copy File
     if ([selector isEqualToString:selectorLoadCopy]) {
         
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
         
         [self copyFileToPasteboard:metadata];
     }
@@ -1541,7 +1540,7 @@
         
         [self openModel:metadata.model isNew:false];
     
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
     }
     
     //download file plist
@@ -1560,7 +1559,7 @@
             if ((countSelectorLoadPlist == 0 || countSelectorLoadPlist % k_maxConcurrentOperation == 0) && [metadata.directoryID isEqualToString:[[NCManageDatabase sharedInstance] getDirectoryID:_serverUrl]]) {
             
                 dispatch_async(dispatch_get_main_queue(), ^{
-                    [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+                    [self reloadDatasource:serverUrl selector:selector];
                 });
             }
         });
@@ -1577,7 +1576,7 @@
         if (app.activePhotos)
             [app.activePhotos downloadFileSuccess:metadata];
 
-        [self reloadDatasource:serverUrl fileID:metadata.fileID selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
     }
     
     // if exists postselector call self with selectorPost
@@ -1681,7 +1680,7 @@
         [app messageNotification:@"_upload_file_" description:message visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
     }
     
-    [self reloadDatasource:serverUrl fileID:nil selector:selector];
+    [self reloadDatasource:serverUrl selector:selector];
 }
 
 - (void)uploadFileSuccess:(CCMetadataNet *)metadataNet fileID:(NSString *)fileID serverUrl:(NSString *)serverUrl selector:(NSString *)selector selectorPost:(NSString *)selectorPost
@@ -1707,7 +1706,7 @@
             
     } else {
     
-        [self reloadDatasource:serverUrl fileID:nil selector:selector];
+        [self reloadDatasource:serverUrl selector:selector];
     }
 }
 
@@ -1876,7 +1875,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 fileID:nil selector:metadataNet.selector];
+    [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
     
     if (errorCode == 401)
         [self changePasswordAccount];
@@ -1968,13 +1967,13 @@
     
     // Search Mode
     if (_isSearchMode)
-        [self reloadDatasource:metadataNet.serverUrl fileID:nil selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
 
     // this is the same directory
     if ([metadataNet.serverUrl isEqualToString:_serverUrl] && !_isSearchMode) {
         
         // reload
-        [self reloadDatasource:metadataNet.serverUrl fileID:nil selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
     
         // stoprefresh
         [_refreshControl endRefreshing];
@@ -2188,7 +2187,7 @@
         if (_isSearchMode)
             [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
         else
-            [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.fileID selector:metadataNet.selector];
+            [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
         
         // next
         if ([_selectedMetadatas count] > 0) {
@@ -2485,7 +2484,7 @@
     if ([metadataNet.selectorPost isEqualToString:selectorReadFolderForced]) {
         [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
     } else {
-        [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.fileID selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
     }
 }
 
@@ -3209,7 +3208,7 @@
     if (_isSearchMode)
         [self readFolderWithForced:YES serverUrl:metadataNet.serverUrl];
     else
-        [self reloadDatasource:metadataNet.serverUrl fileID:metadataNet.fileID selector:metadataNet.selector];
+        [self reloadDatasource:metadataNet.serverUrl selector:metadataNet.selector];
     
     
     tableMetadata *metadata = [[NCManageDatabase sharedInstance] getMetadataWithPredicate:[NSPredicate predicateWithFormat:@"fileID = %@", metadataNet.fileID]];
@@ -3295,7 +3294,7 @@
     
     [[NSFileManager defaultManager] removeItemAtPath:[NSString stringWithFormat:@"%@/%@", app.directoryUser, metadata.fileID] error:nil];
     
-    [self reloadDatasource:serverUrl fileID:metadata.fileID selector:nil];
+    [self reloadDatasource:serverUrl selector:nil];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -4703,10 +4702,10 @@
 
 - (void)reloadDatasource
 {
-    [self reloadDatasource:_serverUrl fileID:nil selector:nil];
+    [self reloadDatasource:_serverUrl selector:nil];
 }
 
-- (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector
+- (void)reloadDatasource:(NSString *)serverUrl selector:(NSString *)selector
 {
     // test
     if (app.activeAccount.length == 0 || serverUrl.length == 0)
@@ -4746,16 +4745,12 @@
     // Reload -> Self se non siamo nella dir appropriata cercala e se è in memoria reindirizza il reload
     if ([serverUrl isEqualToString:_serverUrl] == NO || _serverUrl == nil) {
         
-        if ([selector isEqualToString:selectorDownloadSynchronize]) {
-            [app.activeTransfers reloadDatasource];
+        CCMain *main = [app.listMainVC objectForKey:serverUrl];
+        if (main) {
+            [main reloadDatasource];
         } else {
-            CCMain *main = [app.listMainVC objectForKey:serverUrl];
-            if (main) {
-                [main reloadDatasource];
-            } else {
-                [self tableViewReload];
-                [app.activeTransfers reloadDatasource];
-            }
+            [self tableViewReload];
+            [app.activeTransfers reloadDatasource];
         }
         
         return;

iOSClient/Networking/CCNetworking.h

@@ -74,7 +74,7 @@
 
 @protocol CCNetworkingDelegate <NSObject>
 
-@optional - (void)reloadDatasource:(NSString *)serverUrl fileID:(NSString *)fileID selector:(NSString *)selector;
+@optional - (void)reloadDatasource:(NSString *)serverUrl selector:(NSString *)selector;
 
 @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:fileID:selector:)] && [CCUtility isCryptoPlistString:fileName] == NO)
-            [_delegate reloadDatasource:serverUrl fileID:fileID selector:selector];
+        if ([_delegate respondsToSelector:@selector(reloadDatasource:selector:)] && [CCUtility isCryptoPlistString:fileName] == NO)
+            [_delegate reloadDatasource:serverUrl selector:selector];
         
 #ifndef EXTENSION
         [app updateApplicationIconBadgeNumber];
@@ -1356,8 +1356,8 @@
 
     dispatch_async(dispatch_get_main_queue(), ^{
         // refresh main
-        if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
-            [self.delegate reloadDatasource:serverUrl fileID:nil selector:selector];
+        if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
+            [self.delegate reloadDatasource:serverUrl selector:selector];
         
 #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:fileID:selector:)])
-                            [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID] fileID:metadata.fileID selector:nil];
+                        if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
+                            [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID] selector:nil];
                     });
                 }
             
@@ -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:fileID:selector:)])
-                            [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID] fileID:metadata.fileID selector:nil];
+                        if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
+                            [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:metadata.directoryID] selector:nil];
                     });
                 }
             });
@@ -1630,8 +1630,8 @@
     
     dispatch_async(dispatch_get_main_queue(), ^{
         for (NSString *serverUrl in serversUrl)
-            if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
-                [self.delegate reloadDatasource:serverUrl fileID:nil selector:nil];
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
+                [self.delegate reloadDatasource:serverUrl selector:nil];
     });
 }
 
@@ -1710,8 +1710,8 @@
     
     dispatch_async(dispatch_get_main_queue(), ^{
         for (NSString *directoryID in directoryIDs)
-            if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
-                [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:directoryID] fileID:nil selector:nil];
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
+                [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:directoryID] selector:nil];
     });
 }
 
@@ -1756,8 +1756,8 @@
         NSLog(@"[LOG] Verify read file success, but files already processed");
         
         dispatch_async(dispatch_get_main_queue(), ^{
-            if ([self.delegate respondsToSelector:@selector(reloadDatasource:fileID:selector:)])
-                [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:directoryID] fileID:metadataTemp.fileID selector:metadataNet.selector];
+            if ([self.delegate respondsToSelector:@selector(reloadDatasource:selector:)])
+                [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:directoryID] selector:metadataNet.selector];
         });
         
     } 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 fileID:(NSString *)fileID selector:(NSString *)selector;
+- (void)reloadDatasource:(NSString *)serverUrl selector:(NSString *)selector;
 - (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] fileID:nil selector:nil];
+    [self.delegate reloadDatasource:[[NCManageDatabase sharedInstance] getServerUrl:_metadata.directoryID] selector:nil];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }

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 fileID:nil selector:nil];
+        [app.activeMain reloadDatasource:metadataNet.serverUrl selector:nil];
     }
 }
 
@@ -147,7 +147,7 @@
         
         dispatch_async(dispatch_get_main_queue(), ^{
             if ([metadatasNotPresents count] > 0)
-                [app.activeMain reloadDatasource:metadataNet.serverUrl fileID:nil selector:nil];
+                [app.activeMain reloadDatasource:metadataNet.serverUrl selector:nil];
         });
         
         // ----- 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 fileID:nil selector:nil];
+        [app.activeMain reloadDatasource:serverUrl selector:nil];
     }
 }
 
@@ -377,7 +377,7 @@
     }
     
     dispatch_async(dispatch_get_main_queue(), ^{
-        [app.activeMain reloadDatasource:serverUrl fileID:nil selector:nil];
+        [app.activeMain reloadDatasource:serverUrl selector:nil];
     });
 }