dev

iOSClient/Create/CCCreateCloud.swift

@@ -633,7 +633,22 @@ class CreateFormUploadFile: XLFormViewController, CCMoveDelegate {
             let success = FileManager.default.createFile(atPath: "\(self.appDelegate.directoryUser!)/\(fileNameSave)", contents: data, attributes: nil)
             
             if success {
-//                CCNetworking.shared().uploadFile(fileNameSave, serverUrl: self.serverUrl, assetLocalIdentifier: nil, path:self.appDelegate.directoryUser!, session: k_upload_session, taskStatus: Int(k_taskStatusResume), selector: nil, selectorPost: nil, errorCode: 0, delegate: self.appDelegate.activeMain)
+                
+                let metadataForUpload = tableMetadata()
+                
+                metadataForUpload.account = self.appDelegate.activeAccount
+                metadataForUpload.date = NSDate()
+                metadataForUpload.directoryID = NCManageDatabase.sharedInstance.getDirectoryID(self.serverUrl)!
+                metadataForUpload.fileID = metadataForUpload.directoryID + fileNameSave
+                metadataForUpload.fileName = fileNameSave
+                metadataForUpload.fileNameView = fileNameSave
+                metadataForUpload.path = self.appDelegate.directoryUser!
+                metadataForUpload.session = k_upload_session
+                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)
+                                
             } else {
                 self.appDelegate.messageNotification("_error_", description: "_error_creation_file_", visible: true, delay: TimeInterval(k_dismissAfterSecond), type: TWMessageBarMessageType.info, errorCode: 0)
             }

iOSClient/Networking/CCNetworking.m

@@ -1063,7 +1063,7 @@
              //[[NCManageDatabase sharedInstance] deleteQueueUploadWithAssetLocalIdentifier:assetLocalIdentifier selector:selector];
              
              // Next tableQueueUpload
-             [(AppDelegate *)[[UIApplication sharedApplication] delegate] performSelectorOnMainThread:@selector(loadAutoDownloadUpload:) withObject:[NSNumber numberWithInt:k_maxConcurrentOperationDownloadUpload] waitUntilDone:NO];
+//             [(AppDelegate *)[[UIApplication sharedApplication] delegate] performSelectorOnMainThread:@selector(loadAutoDownloadUpload:) withObject:[NSNumber numberWithInt:k_maxConcurrentOperationDownloadUpload] waitUntilDone:NO];
 #endif
              
              // Manage uploadTask cancel,suspend,resume

iOSClient/UploadFromOtherUpp/CCUploadFromOtherUpp.m

@@ -173,7 +173,22 @@
 
 -(void)upload
 {
-//    [[CCNetworking sharedNetworking] uploadFile:appDelegate.fileNameUpload serverUrl:serverUrlLocal assetLocalIdentifier:nil path:appDelegate.directoryUser session:k_upload_session taskStatus: k_taskStatusResume selector:@"" selectorPost:@"" errorCode:0 delegate:nil];
+    tableMetadata *metadataForUpload = [tableMetadata new];
+    
+    metadataForUpload.account = appDelegate.activeAccount;
+    metadataForUpload.date = [NSDate new];
+    metadataForUpload.directoryID = [[NCManageDatabase sharedInstance] getDirectoryID:serverUrlLocal];
+    metadataForUpload.fileID = [metadataForUpload.directoryID stringByAppendingString:appDelegate.fileNameUpload];
+    metadataForUpload.fileName = appDelegate.fileNameUpload;
+    metadataForUpload.fileNameView = appDelegate.fileNameUpload;
+    metadataForUpload.path = appDelegate.directoryUser;
+    metadataForUpload.session = k_upload_session;
+    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];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }