dev

PickerFileProvider/FileProviderExtension+Actions.swift

@@ -116,9 +116,6 @@ extension FileProviderExtension {
             return
         }
         
-        // Delete queue upload for ImportDocument (if exists)
-        
-        //
         deleteFile(withIdentifier: itemIdentifier, parentItemIdentifier: parentItemIdentifier, metadata: metadata, serverUrl: serverUrl)
        
         // return immediately

PickerFileProvider/FileProviderExtension+Network.swift

@@ -312,7 +312,9 @@ extension FileProviderExtension {
         
         if (tableMetadatas == nil || (tableMetadatas!.count < Int(k_maxConcurrentOperationUpload))) {
             
-            let metadataForUpload = tableMetadatas![0]
+            guard let metadataForUpload = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "account = %@ AND session = %@ AND status = %d", providerData.account, k_upload_session_extension, k_metadataStatusWaitUpload)) else {
+                return
+            }
             
             if self.providerData.copyFile(metadataForUpload.path + "/" + metadataForUpload.fileName, toPath: providerData.directoryUser + "/" + metadataForUpload.fileName) == nil {
                 

PickerFileProvider/FileProviderExtension.swift

@@ -437,7 +437,7 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
                 
                 _ = providerData.copyFile(url.path, toPath: destinationDirectoryUser)
 
-//                CCNetworking.shared().uploadFile(fileName, serverUrl: serverUrl, assetLocalIdentifier: nil, path:directoryUser!, session: k_upload_session, taskStatus: Int(k_taskStatusResume), selector: nil, selectorPost: nil, errorCode: 0, delegate: self)
+                CCNetworking.shared().uploadFile(metadata!, path: directoryUser!, taskStatus: Int(k_taskStatusResume), delegate: self)
             }
 
             self.stopProvidingItem(at: url)

iOSClient/AppDelegate.m

@@ -1336,7 +1336,7 @@
     else if ([[_listChangeTask objectForKey:fileID] isEqualToString:@"reloadUpload"]) {
         
         // V 1.8 if upload_session_wwan change in upload_session
-        if ([metadata.session isEqualToString:k_upload_session_wwan])
+        if ([metadata.session isEqualToString:k_upload_session_wwan] || [metadata.session isEqualToString:k_upload_session_extension])
             metadata.session = k_upload_session;
         
 //        [[CCNetworking sharedNetworking] uploadFileMetadata:metadata taskStatus:k_taskStatusResume delegate:nil];

iOSClient/Settings/CCAdvanced.m

@@ -355,7 +355,6 @@
     [self.hud visibleHudTitle:NSLocalizedString(@"_remove_cache_", nil) mode:MBProgressHUDModeIndeterminate color:nil];
     
     [[NCManageDatabase sharedInstance] clearTable:[tableQueueDownload class] account:appDelegate.activeAccount];
-//    [[NCManageDatabase sharedInstance] clearTable:[tableQueueUpload class] account:appDelegate.activeAccount];
     
     [appDelegate.netQueue cancelAllOperations];
     [[CCNetworking sharedNetworking] settingSessionsDownload:YES upload:YES taskStatus:k_taskStatusCancel activeAccount:appDelegate.activeAccount activeUser:appDelegate.activeUser activeUrl:appDelegate.activeUrl];