dev

iOSClient/Favorites/CCFavorites.m

@@ -343,7 +343,7 @@
 
 - (void)downloadStart:(NSString *)fileID account:(NSString *)account task:(NSURLSessionDownloadTask *)task serverUrl:(NSString *)serverUrl
 {
-    [self reloadDatasource];
+    [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
         
     [appDelegate updateApplicationIconBadgeNumber];
 }
@@ -382,8 +382,7 @@
         }
     }
     
-    [self reloadDatasource];
-    [appDelegate.activeTransfers reloadDatasource];
+    [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
 }
 
 - (void)openWith:(tableMetadata *)metadata

iOSClient/Main/CCMain.m

@@ -391,8 +391,7 @@
         [[NCService sharedInstance] startRequestServicesServer];
         
         // Clear datasorce
-        [appDelegate.activePhotos reloadDatasource];
-        [appDelegate.activeFavorites reloadDatasource];
+        [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:nil];
         
         // Read this folder
         [self readFileReloadFolder];
@@ -400,7 +399,7 @@
     } else {
         
         // reload datasource
-        [self reloadDatasource:_serverUrl];
+        [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:_serverUrl];
     }
 }
 
@@ -1083,7 +1082,7 @@
 
 - (void)downloadStart:(NSString *)fileID account:(NSString *)account task:(NSURLSessionDownloadTask *)task serverUrl:(NSString *)serverUrl
 {
-    [self reloadDatasource:serverUrl];
+    [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
     
     [appDelegate updateApplicationIconBadgeNumber];
 }
@@ -1098,16 +1097,14 @@
         
         // Synchronized
         if ([selector isEqualToString:selectorDownloadSynchronize]) {
-            
-            [self reloadDatasource:serverUrl];
-            [appDelegate.activeFavorites reloadDatasource];
+            [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
         }
         
         // open View File
         if ([selector isEqualToString:selectorLoadFileView] && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
             
-            [self reloadDatasource:serverUrl];
-            
+            [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
+
             if ([metadata.typeFile isEqualToString: k_metadataTypeFile_compress]) {
                 
                 selector = selectorOpenIn;
@@ -1129,8 +1126,8 @@
         // Open with...
         if ([selector isEqualToString:selectorOpenIn] && [[UIApplication sharedApplication] applicationState] == UIApplicationStateActive) {
             
-            [self reloadDatasource:serverUrl];
-            
+            [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
+
             NSURL *url = [NSURL fileURLWithPath:[CCUtility getDirectoryProviderStorageFileID:metadata.fileID fileName:metadata.fileNameView]];
             
             _docController = [UIDocumentInteractionController interactionControllerWithURL:url];
@@ -1174,14 +1171,14 @@
                 [self presentViewController:alertController animated:YES completion:nil];
             }
             
-            [self reloadDatasource:serverUrl];
+            [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
         }
         
         // Copy File
         if ([selector isEqualToString:selectorLoadCopy]) {
             
-            [self reloadDatasource:serverUrl];
-            
+            [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
+
             [self copyFileToPasteboard:metadata];
         }
         
@@ -1196,7 +1193,7 @@
             if (appDelegate.activePhotos)
                 [appDelegate.activePhotos downloadFileSuccessFailure:metadata.fileName fileID:metadata.fileID serverUrl:serverUrl selector:selector errorMessage:errorMessage errorCode:errorCode];
             
-            [self reloadDatasource:serverUrl];
+            [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
         }
         
         // Auto Download Upload
@@ -1230,8 +1227,7 @@
             
         }
         
-        [self reloadDatasource:serverUrl];
-        [appDelegate.activeTransfers reloadDatasource];
+        [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
     }
 }
 
@@ -1298,8 +1294,7 @@
             [appDelegate messageNotification:@"_upload_file_" description:errorMessage visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:errorCode];
     }
     
-    [self reloadDatasource:serverUrl];
-    [appDelegate.activeTransfers reloadDatasource];
+    [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
 }
 
 //
@@ -3328,7 +3323,7 @@
     
     [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
 
-    [self reloadDatasource];
+    [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:nil];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -3969,14 +3964,11 @@
             [main reloadDatasource];
         } else {
             [self tableViewReloadData];
-            [appDelegate.activeTransfers reloadDatasource];
         }
         
         return;
     }
-    
-    [appDelegate.activeTransfers reloadDatasource];
-    
+        
     // Settaggio variabili per le ottimizzazioni
     _directoryGroupBy = [CCUtility getGroupBySettings];
     _directoryOrder = [CCUtility getOrderSettings];

iOSClient/Main/NCMainCommon.swift

@@ -363,11 +363,7 @@ class NCMainCommon: NSObject {
                 NCManageDatabase.sharedInstance.setMetadataSession("", sessionError: "", sessionSelector: "", sessionTaskIdentifier: Int(k_taskIdentifierDone), status: Int(k_metadataStatusNormal), predicate: NSPredicate(format: "fileID == %@", metadata.fileID))
             }
          
-            appDelegate.activeMain.reloadDatasource()
-            appDelegate.activeFavorites.reloadDatasource()
-            if (appDelegate.activeTransfers != nil) {
-                appDelegate.activeTransfers.reloadDatasource()
-            }
+            self.reloadDatasource(ServerUrl: nil)
             
             return
         }
@@ -407,13 +403,7 @@ class NCMainCommon: NSObject {
             }
             
             if cancel == false {
-                DispatchQueue.main.async {
-                    self.appDelegate.activeMain.reloadDatasource()
-                    self.appDelegate.activeFavorites.reloadDatasource()
-                    if (self.appDelegate.activeTransfers != nil) {
-                        self.appDelegate.activeTransfers.reloadDatasource()
-                    }
-                }
+                self.reloadDatasource(ServerUrl: nil)
             }
         }
     }
@@ -444,11 +434,7 @@ class NCMainCommon: NSObject {
             }
         }
         
-        self.appDelegate.activeMain.reloadDatasource()
-        self.appDelegate.activeFavorites.reloadDatasource()
-        if (self.appDelegate.activeTransfers != nil) {
-            self.appDelegate.activeTransfers.reloadDatasource()
-        }
+        self.reloadDatasource(ServerUrl: nil)
     }
     
     @objc func getMetadataFromSectionDataSourceIndexPath(_ indexPath: IndexPath, sectionDataSource: CCSectionDataSourceMetadata) -> tableMetadata? {
@@ -477,6 +463,25 @@ class NCMainCommon: NSObject {
         return metadata
     }
     
+    @objc func reloadDatasource(ServerUrl: String?) {
+        
+        DispatchQueue.main.async {
+            if self.appDelegate.activeMain != nil {
+                if ServerUrl == nil {
+                    self.appDelegate.activeMain.reloadDatasource()
+                } else {
+                    self.appDelegate.activeMain.reloadDatasource(ServerUrl)
+                }
+            }
+            if self.appDelegate.activeFavorites != nil {
+                self.appDelegate.activeFavorites.reloadDatasource()
+            }
+            if self.appDelegate.activeTransfers != nil {
+                self.appDelegate.activeTransfers.reloadDatasource()
+            }
+        }
+    }
+    
     @objc func isValidIndexPath(_ indexPath: IndexPath, tableView: UITableView) -> Bool {
         
         return indexPath.section < tableView.numberOfSections && indexPath.row < tableView.numberOfRows(inSection: indexPath.section)

iOSClient/Synchronize/CCSynchronize.m

@@ -402,7 +402,7 @@
     [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
     
     dispatch_async(dispatch_get_main_queue(), ^{
-        [appDelegate.activeMain reloadDatasource:serverUrl];
+        [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrl];
     });
 }
 

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -195,7 +195,7 @@
     (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
     [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
     
-    [appDelegate.activeMain reloadDatasource:serverUrlLocal];
+    [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrlLocal];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }