dev

Share/ShareViewController.m

@@ -226,11 +226,11 @@
         metadataForUpload.fileNameView = fileName;
         metadataForUpload.path = self.directoryUser;
         metadataForUpload.session = k_upload_session_foreground;
+        metadataForUpload.sessionSelector = selectorUploadFile;
         metadataForUpload.status = k_metadataStatusWaitUpload;
         
         // Add Medtadata for upload
         tableMetadata *metadata = [[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-        // Upload
         [[CCNetworking sharedNetworking] uploadFile:metadata path:self.directoryUser taskStatus:k_taskStatusResume delegate:self];
         
         [self.hud visibleHudTitle:NSLocalizedString(@"_uploading_", nil) mode:MBProgressHUDModeDeterminate color:[NCBrandColor sharedInstance].brandElement];

iOSClient/Create/CCCreateCloud.swift

@@ -619,6 +619,7 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
             alertController.addAction(overwriteAction)
             
             self.present(alertController, animated: true, completion:nil)
+            
         } else {
             
            dismissAndUpload(fileNameSave)
@@ -644,11 +645,14 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
                 metadataForUpload.fileNameView = fileNameSave
                 metadataForUpload.path = self.appDelegate.directoryUser!
                 metadataForUpload.session = k_upload_session
+                metadataForUpload.sessionSelector = selectorUploadFile
                 metadataForUpload.status = Double(k_metadataStatusWaitUpload)
                 
-                let metadata = NCManageDatabase.sharedInstance.addMetadata(metadataForUpload)
-                CCNetworking.shared().uploadFile(metadata, path: self.appDelegate.directoryUser!, taskStatus: Int(k_taskStatusResume), delegate: self.appDelegate.activeMain)
-                                
+                _ = NCManageDatabase.sharedInstance.addMetadata(metadataForUpload)
+                self.appDelegate.perform(#selector(self.appDelegate.loadAutoDownloadUpload), on: Thread.main, with: nil, waitUntilDone: true)
+                
+                self.appDelegate.activeMain.reloadDatasource(self.serverUrl)
+                
             } else {
                 self.appDelegate.messageNotification("_error_", description: "_error_creation_file_", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.info, errorCode: 0)
             }

iOSClient/Main/CCMain.m

@@ -730,13 +730,15 @@
                     metadataForUpload.fileNameView = fileName;
                     metadataForUpload.path = appDelegate.directoryUser;
                     metadataForUpload.session = k_upload_session;
+                    metadataForUpload.sessionSelector = selectorUploadFile;
                     metadataForUpload.status = k_metadataStatusWaitUpload;
                     
                     // Add Medtadata for upload
                     (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-                    // Start upload now
                     [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
                     
+                    [self reloadDatasource];
+                    
                 } else {
                     
                     [appDelegate messageNotification:@"_error_" description:error.description visible:YES delay:k_dismissAfterSecond type:TWMessageBarMessageTypeError errorCode:error.code];
@@ -1407,10 +1409,12 @@
             
             // Add Medtadata for upload
             (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-            // Start upload now
-            [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
         }
     }
+    
+    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+
+    [self reloadDatasource];
 }
 
 #pragma --------------------------------------------------------------------------------------------
@@ -3522,12 +3526,11 @@
                             metadataForUpload.fileNameView = metadata.fileNameView;
                             metadataForUpload.path = appDelegate.directoryUser;
                             metadataForUpload.session = k_upload_session;
+                            metadataForUpload.sessionSelector = selectorUploadFile;
                             metadataForUpload.status = k_metadataStatusWaitUpload;
                             
                             // Add Medtadata for upload
                             (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-                            // Start upload now
-                            [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
                         });
                         
                         timer += 0.1;
@@ -3536,6 +3539,10 @@
             }
         }
     }
+    
+    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+
+    [self reloadDatasource];
 }
 
 #pragma --------------------------------------------------------------------------------------------

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -183,12 +183,14 @@
     metadataForUpload.fileNameView = appDelegate.fileNameUpload;
     metadataForUpload.path = appDelegate.directoryUser;
     metadataForUpload.session = k_upload_session;
+    metadataForUpload.sessionSelector = selectorUploadFile;
     metadataForUpload.status = k_metadataStatusWaitUpload;
     
     // Add Medtadata for upload
-    tableMetadata *metadata = [[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
-    // Upload
-    [[CCNetworking sharedNetworking] uploadFile:metadata path:appDelegate.directoryUser taskStatus:k_taskStatusResume delegate:self];
+    (void)[[NCManageDatabase sharedInstance] addMetadata:metadataForUpload];
+    [appDelegate performSelectorOnMainThread:@selector(loadAutoDownloadUpload) withObject:nil waitUntilDone:YES];
+    
+    [appDelegate.activeMain reloadDatasource:serverUrlLocal];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }