dev

PickerFileProvider/FileProvider.swift

@@ -45,7 +45,6 @@ var listUpdateItems = [NSFileProviderItem]()
 var listFavoriteIdentifierRank = [String:NSNumber]()
 var fileNamePathImport = [String]()
 
-var uploadMetadataNetInProgress: CCMetadataNet?
 var timerUpload: Timer?
 
 class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
@@ -65,7 +64,8 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
                 
                 timerUpload = Timer.init(timeInterval: TimeInterval(k_timerProcessAutoDownloadUpload), repeats: true, block: { (Timer) in
                     
-                    if uploadMetadataNetInProgress == nil {
+                    let queueInLock = NCManageDatabase.sharedInstance.getQueueUploadInLock()
+                    if queueInLock != nil && queueInLock!.count == 0 {
                         
                         let metadataNetQueue = NCManageDatabase.sharedInstance.getQueueUploadLock(selector: selectorUploadFile, withPath: true)
                         if  metadataNetQueue != nil {

iOSClient/AppDelegate.m

@@ -1508,6 +1508,13 @@
             
             NSString *toPath = [NSString stringWithFormat:@"%@/%@", self.directoryUser, metadataNet.fileName];
             [CCUtility copyFileAtPath:metadataNet.path toPath:toPath];
+            
+            // Convert k_upload_session_extension -> k_upload_session
+            if ([metadataNet.session isEqualToString:k_upload_session_extension]) {
+                metadataNet.fileID = @"";
+                metadataNet.session = k_upload_session;
+            }
+            
             [[CCNetworking sharedNetworking] uploadFile:metadataNet.fileName serverUrl:metadataNet.serverUrl assetLocalIdentifier:metadataNet.assetLocalIdentifier fileID:metadataNet.fileID session:metadataNet.session taskStatus:k_taskStatusResume selector:metadataNet.selector selectorPost:metadataNet.selectorPost errorCode:0 delegate:nil];
             counterNewUpload++;
         }