marinofaggiana 4 年之前
父节点
当前提交
2170717d43
共有 2 个文件被更改,包括 2 次插入8 次删除
  1. 1 1
      iOSClient/AutoUpload/NCAutoUpload.m
  2. 1 7
      iOSClient/Networking/NCNetworkingAutoUpload.swift

+ 1 - 1
iOSClient/AutoUpload/NCAutoUpload.m

@@ -406,7 +406,7 @@
             metadataForUpload.status = k_metadataStatusWaitUpload;
             metadataForUpload.typeFile = k_metadataTypeFile_image;
             if (assetMediaType == PHAssetMediaTypeVideo) {
-                metadata.typeFile = k_metadataTypeFile_video;
+                metadataForUpload.typeFile = k_metadataTypeFile_video;
             }
 
             // Add Medtadata MOV LIVE PHOTO for upload

+ 1 - 7
iOSClient/Networking/NCNetworkingAutoUpload.swift

@@ -66,14 +66,8 @@ class NCNetworkingAutoUpload: NSObject {
          
         while counterUpload < maxConcurrentOperationUpload {
             if sizeUpload > k_maxSizeOperationUpload { break }
-            var predicate = NSPredicate()
+            let predicate = NSPredicate(format: "sessionSelector == %@ AND status == %d", selectorUploadFile, k_metadataStatusWaitUpload)
              
-            if UIApplication.shared.applicationState == .background {
-                predicate = NSPredicate(format: "sessionSelector == %@ AND status == %d AND typeFile != %@", selectorUploadFile, k_metadataStatusWaitUpload, k_metadataTypeFile_video)
-            } else {
-                predicate = NSPredicate(format: "sessionSelector == %@ AND status == %d", selectorUploadFile, k_metadataStatusWaitUpload)
-            }
-
             if let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: predicate, sorted: "date", ascending: true, freeze: true) {
                 if CCUtility.isFolderEncrypted(metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account) {
                     if UIApplication.shared.applicationState == .background { break }