marinofaggiana há 4 anos atrás
pai
commit
22e5f864d4

+ 1 - 1
File Provider Extension/FileProviderExtension+NetworkingDelegate.swift

@@ -84,7 +84,7 @@ extension FileProviderExtension: NCNetworkingDelegate {
         } else {
            
             // Error
-            NCManageDatabase.sharedInstance.setMetadataSession("", sessionError: "", sessionSelector: "", sessionTaskIdentifier: 0, status: Int(k_metadataStatusUploadError), predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
+            NCManageDatabase.sharedInstance.setMetadataSession(ocId: ocIdTemp, session: "", sessionError: "", sessionSelector: "", sessionTaskIdentifier: 0, status: Int(k_metadataStatusUploadError))
         }
     }
 }

+ 2 - 3
iOSClient/Database/NCManageDatabase.swift

@@ -2015,13 +2015,12 @@ class NCManageDatabase: NSObject {
         return tableMetadata.init(value: metadata)
     }
     
-    @objc func setMetadataSession(_ session: String?, sessionError: String?, sessionSelector: String?, sessionTaskIdentifier: Int, status: Int, predicate: NSPredicate) {
+    @objc func setMetadataSession(ocId: String, session: String? = nil, sessionError: String? = nil, sessionSelector: String? = nil, sessionTaskIdentifier: Int = 0, status: Int = 0) {
         
         let realm = try! Realm()
-
         realm.beginWrite()
 
-        guard let result = realm.objects(tableMetadata.self).filter(predicate).first else {
+        guard let result = realm.objects(tableMetadata.self).filter("ocId == %@", ocId).first else {
             realm.cancelWrite()
             return
         }

+ 1 - 1
iOSClient/Main/NCDetailViewController.swift

@@ -441,7 +441,7 @@ class NCDetailViewController: UIViewController {
     
     @objc func viewFile(metadata: tableMetadata, selector: String?) {
                 
-        self.metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId), freeze: !metadata.isFrozen)
+        self.metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId), freeze: true)
         self.selector = selector
         self.backgroundView.image = nil
         

+ 1 - 1
iOSClient/Main/NCMainCommon.swift

@@ -139,7 +139,7 @@ class NCMainCommon: NSObject, NCAudioRecorderViewControllerDelegate, UIDocumentI
         if metadata.session == NCCommunicationCommon.shared.sessionIdentifierDownload {
             NCNetworking.shared.cancelDownload(metadata: metadata)
         } else if metadata.session == NCCommunicationCommon.shared.sessionIdentifierUpload {
-            NCNetworking.shared.cancelUpload(metadata: metadata)
+            NCNetworking.shared.cancelUpload(ocId: metadata.ocId)
         } else {
         
             var session: URLSession?

+ 2 - 1
iOSClient/Networking/NCNetworking.swift

@@ -271,7 +271,8 @@ import Alamofire
     
     //MARK: - Upload
 
-    @objc func cancelUpload(metadata: tableMetadata) {
+    @objc func cancelUpload(ocId: String) {
+        guard let metadata = NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "ocId == %@", ocId), freeze: true) else { return }
         
         guard let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileName) else { return }