update clear code

iOSClient/AppDelegate.h

@@ -169,6 +169,7 @@
 
 // Task Networking
 - (void)loadAutoDownloadUpload;
+- (void)startLoadAutoDownloadUpload;
 
 // Maintenance Mode
 - (void)maintenanceMode:(BOOL)mode;

iOSClient/AppDelegate.m

@@ -1407,6 +1407,13 @@
     _timerProcessAutoDownloadUpload = [NSTimer scheduledTimerWithTimeInterval:k_timerProcessAutoDownloadUpload target:self selector:@selector(loadAutoDownloadUpload) userInfo:nil repeats:YES];
 }
 
+- (void)startLoadAutoDownloadUpload
+{
+    if (self.timerProcessAutoDownloadUpload.isValid) {
+        [self performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+    }
+}
+
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== Open CCUploadFromOtherUpp  =====
 #pragma --------------------------------------------------------------------------------------------

iOSClient/Main/CCDetail.m

@@ -640,9 +640,9 @@
         
     // Add Metadata for Download
     (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForDownload];
-    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-    
     [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:metadata.serverUrl fileID:metadataForDownload.fileID action:k_action_MOD];
+    
+    [appDelegate startLoadAutoDownloadUpload];
 
     [CCGraphics addImageToTitle:NSLocalizedString(@"_...loading..._", nil) colorTitle:[NCBrandColor sharedInstance].brandText imageTitle:[CCGraphics changeThemingColorImage:[UIImage imageNamed:@"load"] multiplier:2 color:[NCBrandColor sharedInstance].brandText] imageRight:NO navigationItem:self.navigationItem];
 }

iOSClient/Main/CCMain.m

@@ -741,9 +741,9 @@
                             
                             // Add Medtadata for upload
                             (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-                            [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-                            
                             [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:nil action:k_action_NULL];
+
+                            [appDelegate startLoadAutoDownloadUpload];
                         }];
                         
                         [alertController addAction:cancelAction];
@@ -759,9 +759,9 @@
                         
                         // Add Medtadata for upload
                         (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-                        [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-
                         [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:nil action:k_action_NULL];
+                        
+                        [appDelegate startLoadAutoDownloadUpload];
                     }
                     
                 } else {
@@ -889,7 +889,8 @@
                     
                 // Add Metadata for Download
                 (void)[[NCManageDatabase sharedInstance] addMetadata:metadata];
-                [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+                
+                [appDelegate startLoadAutoDownloadUpload];
             }
         }
         
@@ -1088,7 +1089,8 @@
 
                 // Add Medtadata for upload
                 (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-                [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+                
+                [appDelegate startLoadAutoDownloadUpload];
             }];
             
             [alertController addAction:cancelAction];
@@ -1104,7 +1106,8 @@
             
             // Add Medtadata for upload
             (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-            [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+            
+            [appDelegate startLoadAutoDownloadUpload];
         }
     }
     
@@ -2164,9 +2167,9 @@
                     
                 // Add Metadata for Download
                 (void)[[NCManageDatabase sharedInstance] addMetadata:metadata];
-                [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-                
                 [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:metadata.fileID action:k_action_MOD];
+                
+                [appDelegate startLoadAutoDownloadUpload];
             }
             
         } else if (errorCode == kOCErrorServerUnauthorized) {
@@ -2194,9 +2197,9 @@
     
     // Add Metadata for Download
     (void)[[NCManageDatabase sharedInstance] addMetadata:metadata];
-    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-    
     [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:metadata.fileID action:k_action_MOD];
+    
+    [appDelegate startLoadAutoDownloadUpload];
 }
 
 - (void)openIn:(tableMetadata *)metadata
@@ -2856,9 +2859,9 @@
             
         // Add Metadata for Download
         (void)[[NCManageDatabase sharedInstance] addMetadata:self.metadata];
-        [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-            
         [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:self.metadata.fileID action:k_action_MOD];
+        
+        [appDelegate startLoadAutoDownloadUpload];
     }
 }
 
@@ -2885,9 +2888,9 @@
                 
             // Add Metadata for Download
             (void)[[NCManageDatabase sharedInstance] addMetadata:metadata];
-            [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-                
             [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:metadata.fileID action:k_action_MOD];
+            
+            [appDelegate startLoadAutoDownloadUpload];
         }
     }
     
@@ -2969,9 +2972,9 @@
         }
     }
     
-    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-
     [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:nil action:k_action_NULL];
+    
+    [appDelegate startLoadAutoDownloadUpload];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -3544,8 +3547,10 @@
                                         self.metadata.sessionError = @"";
                                         self.metadata.sessionSelector = selectorDownloadEditPhoto;
                                         self.metadata.status = k_metadataStatusWaitDownload;
+                                        
                                         (void)[[NCManageDatabase sharedInstance] addMetadata:self.metadata];
-                                        [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+                                        
+                                        [appDelegate startLoadAutoDownloadUpload];
                                     }];
         }
         
@@ -3572,9 +3577,9 @@
                                             
                                             // Add Metadata for Download
                                             (void)[[NCManageDatabase sharedInstance] addMetadata:self.metadata];
-                                            [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-                                            
                                             [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:self.metadata.fileID action:k_action_MOD];
+                                            
+                                            [appDelegate startLoadAutoDownloadUpload];
                                         } else if (localFile.offline == false) {
                                             [[NCManageDatabase sharedInstance] setLocalFileWithFileID:self.metadata.fileID offline:true];
                                             [self.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
@@ -4154,9 +4159,9 @@
                     
                     // Add Metadata for Download
                     (void)[[NCManageDatabase sharedInstance] addMetadata:self.metadata];
-                    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-                    
                     [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:self.serverUrl fileID:self.metadata.fileID action:k_action_MOD];
+                    
+                    [appDelegate startLoadAutoDownloadUpload];
                 }
             }
         }

iOSClient/Main/Create cloud/NCCreateFormUploadFileText.swift

@@ -215,10 +215,10 @@ class NCCreateFormUploadFileText: XLFormViewController, NCSelectDelegate {
                 metadataForUpload.status = Int(k_metadataStatusWaitUpload)
                 
                 _ = NCManageDatabase.sharedInstance.addMetadata(metadataForUpload)
-                self.appDelegate.perform(#selector(self.appDelegate.loadAutoDownloadUpload), on: Thread.main, with: nil, waitUntilDone: true)
-                
                 NCMainCommon.sharedInstance.reloadDatasource(ServerUrl: self.serverUrl, fileID: nil, action: Int32(k_action_NULL))
-                
+
+                self.appDelegate.startLoadAutoDownloadUpload()
+            
             } else {
                 
                 self.appDelegate.messageNotification("_error_", description: "_error_creation_file_", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.info, errorCode: 0)

iOSClient/Main/Create cloud/NCCreateFormUploadScanDocument.swift

@@ -396,10 +396,10 @@ class NCCreateFormUploadScanDocument: XLFormViewController, NCSelectDelegate {
         metadataForUpload.status = Int(k_metadataStatusWaitUpload)
         
         _ = NCManageDatabase.sharedInstance.addMetadata(metadataForUpload)
-        self.appDelegate.perform(#selector(self.appDelegate.loadAutoDownloadUpload), on: Thread.main, with: nil, waitUntilDone: true)
-        
         NCMainCommon.sharedInstance.reloadDatasource(ServerUrl: self.serverUrl, fileID: nil, action: Int32(k_action_NULL))
-        
+
+        self.appDelegate.startLoadAutoDownloadUpload()
+                        
         // Request delete all image scanned
         let alertController = UIAlertController(title: "", message: NSLocalizedString("_delete_all_scanned_images_", comment: ""), preferredStyle: .alert)
         

iOSClient/Main/NCMainCommon.swift

@@ -1053,6 +1053,7 @@ class NCMainCommon: NSObject, PhotoEditorDelegate, NCAudioRecorderViewController
         _ = NCManageDatabase.sharedInstance.addMetadata(metadata)
         
         self.reloadDatasource(ServerUrl: appDelegate.activeMain.serverUrl, fileID: metadata.fileID, action: k_action_NULL)
+        appDelegate.startLoadAutoDownloadUpload()
     }
 }
     
@@ -1171,7 +1172,7 @@ class NCNetworkingMain: NSObject, CCNetworkingDelegate {
             // Synchronized
             if selector == selectorDownloadSynchronize {
                 appDelegate.updateApplicationIconBadgeNumber()
-                appDelegate.loadAutoDownloadUpload()
+                appDelegate.startLoadAutoDownloadUpload()
                 return
             }
             
@@ -1248,7 +1249,7 @@ class NCNetworkingMain: NSObject, CCNetworkingDelegate {
                 }
             }
             
-            self.appDelegate.performSelector(onMainThread: #selector(self.appDelegate.loadAutoDownloadUpload), with: nil, waitUntilDone: true)
+            appDelegate.startLoadAutoDownloadUpload()
             
         } else {
             
@@ -1275,7 +1276,7 @@ class NCNetworkingMain: NSObject, CCNetworkingDelegate {
             }
         }
         
-        appDelegate.loadAutoDownloadUpload()
+        appDelegate.startLoadAutoDownloadUpload()
     }
     
     // UPLOAD
@@ -1299,9 +1300,7 @@ class NCNetworkingMain: NSObject, CCNetworkingDelegate {
         NCMainCommon.sharedInstance.reloadDatasource(ServerUrl: serverUrl, fileID: fileID, action: Int32(k_action_MOD))
         
         if errorCode == 0 {
-            if self.appDelegate.timerProcessAutoDownloadUpload.isValid {
-                self.appDelegate.performSelector(onMainThread: #selector(self.appDelegate.loadAutoDownloadUpload), with: nil, waitUntilDone: true)
-            }
+            appDelegate.startLoadAutoDownloadUpload()
         } else {
             if errorCode != -999 && errorCode != kOCErrorServerUnauthorized && errorMessage != "" {
                 appDelegate.messageNotification("_upload_file_", description: errorMessage, visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.error, errorCode: errorCode)

iOSClient/PeekPop/CCPeekPop.m

@@ -115,7 +115,8 @@
             
         // Add Metadata for Download
         (void)[[NCManageDatabase sharedInstance] addMetadata:_metadata];
-        [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+        
+        [appDelegate startLoadAutoDownloadUpload];
     }];
     
     UIPreviewAction *share = [UIPreviewAction actionWithTitle:NSLocalizedString(@"_share_", nil) style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *action,  UIViewController *previewViewController){

iOSClient/Text/NCText.swift

@@ -172,9 +172,9 @@ class NCText: UIViewController, UITextViewDelegate {
                         metadata.status = Int(k_metadataStatusWaitUpload)
 
                         _ = NCManageDatabase.sharedInstance.addMetadata(metadata)
-                        self.appDelegate.perform(#selector(self.appDelegate.loadAutoDownloadUpload), on: Thread.main, with: nil, waitUntilDone: true)
-                        
                         NCMainCommon.sharedInstance.reloadDatasource(ServerUrl: serverUrl, fileID: metadata.fileID, action: Int32(k_action_MOD))
+                        
+                        self.appDelegate.startLoadAutoDownloadUpload()
 
                         self.delegate?.dismissTextView()
                     })

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -191,10 +191,10 @@
     
     // Add Medtadata for upload
     (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
-    
     [[NCMainCommon sharedInstance] reloadDatasourceWithServerUrl:serverUrlLocal fileID:metadataForUpload.fileID action:k_action_NULL];
 
+    [appDelegate startLoadAutoDownloadUpload];
+    
     [self dismissViewControllerAnimated:YES completion:nil];
 }