Marino Faggiana 7 سال پیش
والد
کامیت
07f32d36cd

+ 1 - 1
Picker/DocumentPickerViewController.swift

@@ -454,7 +454,7 @@ class DocumentPickerViewController: UIDocumentPickerExtensionViewController, CCN
             
             var metadata : tableMetadata? = CCUtility.insertInformationPlist(recordMetadata, directoryUser: directoryUser)!
             metadata = CCUtility.insertTypeFileIconName(metadata, serverUrl: serverUrl, autoUploadFileName: autoUploadFileName, autoUploadDirectory: autoUploadDirectory)
-            metadata = NCManageDatabase.sharedInstance.updateMetadata(metadata!, activeUrl: activeUrl)
+            metadata = NCManageDatabase.sharedInstance.updateMetadata(metadata!)
             
             if metadata != nil {
                 if metadata!.type == k_metadataType_template {

+ 1 - 1
PickerFileProvider/FileProvider.swift

@@ -134,7 +134,7 @@ class FileProvider: NSFileProviderExtension, CCNetworkingDelegate {
         }
         
         // Verify if already exists in tableMetadata (session)
-        if  NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "fileName == %@ AND directoryID == %@ AND session == %@", fileName, directoryID!, k_upload_session_foreground)) == nil {
+        if  NCManageDatabase.sharedInstance.getMetadata(predicate: NSPredicate(format: "fileName == %@ AND directoryID == %@ AND session = ''", fileName, directoryID!)) == nil {
             
             CCNetworking.shared().settingDelegate(self)
             CCNetworking.shared().uploadFile(fileName, serverUrl: serverUrl, cryptated: false, onlyPlist: false, session: k_upload_session_foreground, taskStatus: Int(k_taskStatusResume), selector: nil, selectorPost: nil, errorCode: 0, delegate: self)

+ 1 - 1
iOSClient/Database/NCManageDatabase.swift

@@ -1249,7 +1249,7 @@ class NCManageDatabase: NSObject {
         self.setDateReadDirectory(directoryID: directoryIDTo)
     }
     
-    func updateMetadata(_ metadata: tableMetadata, activeUrl: String) -> tableMetadata? {
+    func updateMetadata(_ metadata: tableMetadata) -> tableMetadata? {
         
         let directoryID = metadata.directoryID
         

+ 1 - 1
iOSClient/Move/CCMove.m

@@ -283,7 +283,7 @@
         
         metadata = [CCUtility insertInformationPlist:metadata directoryUser:directoryUser];
         metadata = [CCUtility insertTypeFileIconName:metadata serverUrl:serverUrl autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory];
-        metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:activeUrl];
+        metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata];
         
         // se è un template aggiorniamo anche nel FileSystem
         if ([metadata.type isEqualToString: k_metadataType_template]) {

+ 4 - 4
iOSClient/Networking/CCNetworking.m

@@ -797,10 +797,10 @@
                         metadata = [CCUtility insertTypeFileIconName:metadata serverUrl:serverUrl autoUploadFileName:autoUploadFileName autoUploadDirectory:autoUploadDirectory];
 
                     }
-                    metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:_activeUrl];
+                    metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata];
                 });
             } else {
-                metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:_activeUrl];
+                metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata];
             }
             
         } else {
@@ -1468,7 +1468,7 @@
         
         metadata.sessionTaskIdentifier = k_taskIdentifierDone;
         
-        metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:_activeUrl];
+        metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata];
     }
     
     // ALL TASK DONE (PLAIN/CRYPTO)
@@ -1484,7 +1484,7 @@
         metadata.sessionError = @"";
         metadata.sessionID = @"";
         
-        metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata activeUrl:_activeUrl];
+        metadata = [[NCManageDatabase sharedInstance] updateMetadata:metadata];
         
         // rename file sessionID -> fileID
         [CCUtility moveFileAtPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, sessionID]  toPath:[NSString stringWithFormat:@"%@/%@", _directoryUser, metadata.fileID]];