marinofaggiana 4 éve
szülő
commit
04695c59f5

+ 1 - 1
iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -350,7 +350,7 @@ import NCCommunication
         
         if self.editorId == k_editor_collabora {
             
-            NCCommunication.shared.createRichdocuments(path: fileNamePath, templateID: templateIdentifier) { (account, url, errorCode, errorDescription) in
+            NCCommunication.shared.createRichdocuments(path: fileNamePath, templateId: templateIdentifier) { (account, url, errorCode, errorDescription) in
                 
                 if errorCode == 0 && account == self.appDelegate.activeAccount && url != nil {
                    

+ 5 - 23
iOSClient/Networking/NCNetworkingE2EE.swift

@@ -256,39 +256,21 @@ import NCCommunication
                     }
             
                     var method = ""
-                    let communication = OCNetworking.sharedManager()?.sharedOCCommunication()
-                    let appDelegate = UIApplication.shared.delegate as! AppDelegate
-
                     if errorCode == 0 && existsMetadata != nil {
-                       
-                        communication?.updateEnd(toEndMetadata: appDelegate.activeUrl+"/", fileId: fileId, encryptedMetadata: metadata, e2eToken: e2eToken, on: communication, successRequest: { (response, a, b) in
-                            
-                        }, failureRequest: { (response, error, b) in
-                            
-                        })
                         method = "PUT"
-                        
                     } else if  errorCode == 404 {
                         method = "POST"
-                        
-                        communication?.storeEnd(toEndMetadata: appDelegate.activeUrl+"/", fileId: fileId, e2eToken: e2eToken, encryptedMetadata: metadata, on: communication, successRequest: { (response, a, b) in
-                            
-                        }, failureRequest: { (response, error, b) in
-                            
-                        })
-                        
                     } else {
                         completion(errorCode, errorDescription)
                     }
-               
-                    
-                    /*
+                                   
                     NCCommunication.shared.putE2EEMetadata(fileId: fileId, e2eToken: e2eToken!, method: method, metadata: metadata) { (account, metadata, errorCodeSendMetadata, errorDescriptionSendMetadata) in
-                        
+                                                
                         self.unlock(serverUrl: serverUrl, fileId: fileId) { (errorCode, errorDescription) in }
-                        completion(errorCode, errorDescription)
+                        
+                        completion(errorCodeSendMetadata, errorDescriptionSendMetadata)
                     }
-                    */
+                    
                 }
             } else {
                 completion(errorCode, errorDescription)