marinofaggiana 4 年之前
父节点
当前提交
849973d46c
共有 2 个文件被更改,包括 9 次插入1 次删除
  1. 8 1
      iOSClient/Networking/NCNetworking.swift
  2. 1 0
      iOSClient/Utility/NCUtility.swift

+ 8 - 1
iOSClient/Networking/NCNetworking.swift

@@ -406,6 +406,8 @@ import Alamofire
                 return
                 return
             }
             }
             
             
+            guard let tableAccount = NCManageDatabase.sharedInstance.getAccount(predicate: NSPredicate(format: "account == %@", metadata.account)) else { return }
+            
             if errorCode == 0 && ocId != nil {
             if errorCode == 0 && ocId != nil {
                 
                 
                 CCUtility.moveFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId), toPath:  CCUtility.getDirectoryProviderStorageOcId(ocId))
                 CCUtility.moveFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId), toPath:  CCUtility.getDirectoryProviderStorageOcId(ocId))
@@ -419,7 +421,12 @@ import Alamofire
                 metadata.sessionError = ""
                 metadata.sessionError = ""
                 metadata.sessionTaskIdentifier = 0
                 metadata.sessionTaskIdentifier = 0
                 metadata.status = Int(k_metadataStatusNormal)
                 metadata.status = Int(k_metadataStatusNormal)
-                        
+                
+                // Delete Asset on Photos album
+                if tableAccount.autoUploadDeleteAssetLocalIdentifier && metadata.assetLocalIdentifier != "" && metadata.sessionSelector == selectorUploadAutoUpload {
+                        metadata.deleteAssetLocalIdentifier = true;
+                }
+                
                 if let result = NCManageDatabase.sharedInstance.addMetadata(metadata) { metadata = result }
                 if let result = NCManageDatabase.sharedInstance.addMetadata(metadata) { metadata = result }
 
 
                 if CCUtility.getDisableLocalCacheAfterUpload() {
                 if CCUtility.getDisableLocalCacheAfterUpload() {

+ 1 - 0
iOSClient/Utility/NCUtility.swift

@@ -500,6 +500,7 @@ class NCUtility: NSObject {
         return image ?? UIImage()
         return image ?? UIImage()
     }
     }
     
     
+    // Delete Asset on Photos album
     @objc func deleteAssetLocalIdentifiers(account: String, sessionSelector: String) {
     @objc func deleteAssetLocalIdentifiers(account: String, sessionSelector: String) {
         
         
         if UIApplication.shared.applicationState != .active { return }
         if UIApplication.shared.applicationState != .active { return }