dev

PickerFileProvider/FileProviderExtension.swift

@@ -426,7 +426,6 @@ class FileProviderExtension: NSFileProviderExtension, CCNetworkingDelegate {
                 
                 // Prepare for send Metadata
                 metadata!.session = k_upload_session
-                metadata!.sessionTaskIdentifier = Int(k_taskIdentifierWaitStart)
                 _ = NCManageDatabase.sharedInstance.updateMetadata(metadata!)
                 
             } else {

iOSClient/AppDelegate.m

@@ -1333,13 +1333,11 @@
         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];
+        [[CCNetworking sharedNetworking] uploadFile:metadata path:self.directoryUser taskStatus:k_taskStatusResume delegate:self.activeMain];
     }
     else if ([[_listChangeTask objectForKey:fileID] isEqualToString:@"reloadDownload"]) {
         
-        [[NCManageDatabase sharedInstance] setMetadataSession:@"" sessionError:@"" sessionSelector:@"" sessionSelectorPost:@"" sessionTaskIdentifier:k_taskIdentifierDone status:k_metadataStatusNULL predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
-        
-//        [[CCNetworking sharedNetworking] downloadFile:metadata.fileName fileID:fileID serverUrl:serverUrl selector:metadata.sessionSelector selectorPost:metadata.sessionSelectorPost session:k_download_session taskStatus:k_taskStatusResume delegate:self.activeMain];
+        [[NCManageDatabase sharedInstance] setMetadataSession:nil sessionError:@"" sessionSelector:nil sessionSelectorPost:nil sessionTaskIdentifier:k_taskIdentifierDone status:k_metadataStatusWaitDownload predicate:[NSPredicate predicateWithFormat:@"fileID = %@", fileID]];
     }
     else if ([[_listChangeTask objectForKey:metadata.fileID] isEqualToString:@"cancelUpload"]) {
         

iOSClient/CCGlobal.h

@@ -124,7 +124,6 @@ extern NSString *const flowEndpoint;
 // TaskIdentifier
 #define k_taskIdentifierDone                            -1
 #define k_taskIdentifierStop                            -2
-#define k_taskIdentifierWaitStart                       -3
 #define k_taskIdentifierError                           -99999
 #define k_taskIdentifierNULL                            99999
 
@@ -133,7 +132,17 @@ extern NSString *const flowEndpoint;
 #define k_taskStatusResume                              -2
 #define k_taskStatusSuspend                             -3
 
-#define k_timerVerifySession                            10
+// Metadata : Status
+#define k_metadataStatusNormal                          0
+#define k_metadataStatusHide                            1
+#define k_metadataStatusWaitUpload                      2
+#define k_metadataStatusInUpload                        3
+#define k_metadataStatusUploading                       4
+#define k_metadataStatusWaitDownload                    5
+#define k_metadataStatusInDownload                      6
+#define k_metadataStatusDownloading                     7
+#define k_metadataStatusNULL                            99999
+
 #define k_timerProcessAutoDownloadUpload                5
 #define k_timerUpdateApplicationIconBadgeNumber         3
 
@@ -230,17 +239,6 @@ extern NSString *const flowEndpoint;
 #define k_metadataTypeFile_unknown                      @"unknow"
 #define k_metadataTypeFile_video                        @"video"
 
-// Metadata : Status
-#define k_metadataStatusNormal                          0
-#define k_metadataStatusHide                            1
-#define k_metadataStatusWaitUpload                      2
-#define k_metadataStatusInUpload                        3
-#define k_metadataStatusUploading                       4
-#define k_metadataStatusWaitDownload                    5
-#define k_metadataStatusInDownload                      6
-#define k_metadataStatusDownloading                     7
-#define k_metadataStatusNULL                            99999
-
 // TabBar button
 #define k_tabBarApplicationIndexFile                    0
 #define k_tabBarApplicationIndexFavorite                1