Fix move proccessing statusfix/move-copy

Signed-off-by: Henrik Storch <henrik.storch@nextcloud.com>

3 files changed, 12 insertions, 12 deletions

diff --git a/iOSClient/Networking/NCNetworking.swift b/iOSClient/Networking/NCNetworking.swift
index c8b71991c..4bf6be65e 100644
--- a/iOSClient/Networking/NCNetworking.swift
+++ b/iOSClient/Networking/NCNetworking.swift
@@ -1291,22 +1291,22 @@ import Queuer
 
     // MARK: - WebDav Move
 
-    @objc func moveMetadata(_ metadata: tableMetadata, serverUrlTo: String, overwrite: Bool, completion: @escaping (_ errorCode: Int, _ errorDescription: String?) -> Void) {
+    @objc func moveMetadata(_ metadata: tableMetadata, metadataTo: tableMetadata, overwrite: Bool, completion: @escaping (_ errorCode: Int, _ errorDescription: String?) -> Void) {
 
         if let metadataLive = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata) {
-            moveMetadataPlain(metadataLive, serverUrlTo: serverUrlTo, overwrite: overwrite) { errorCode, errorDescription in
+            moveMetadataPlain(metadataLive, metadataTo: metadataTo, overwrite: overwrite) { errorCode, errorDescription in
                 if errorCode == 0 {
-                    self.moveMetadataPlain(metadata, serverUrlTo: serverUrlTo, overwrite: overwrite, completion: completion)
+                    self.moveMetadataPlain(metadata, metadataTo: metadataTo, overwrite: overwrite, completion: completion)
                 } else {
                     completion(errorCode, errorDescription)
                 }
             }
         } else {
-            moveMetadataPlain(metadata, serverUrlTo: serverUrlTo, overwrite: overwrite, completion: completion)
+            moveMetadataPlain(metadata, metadataTo: metadataTo, overwrite: overwrite, completion: completion)
         }
     }
 
-    private func moveMetadataPlain(_ metadata: tableMetadata, serverUrlTo: String, overwrite: Bool, completion: @escaping (_ errorCode: Int, _ errorDescription: String?) -> Void) {
+    private func moveMetadataPlain(_ metadata: tableMetadata, metadataTo: tableMetadata, overwrite: Bool, completion: @escaping (_ errorCode: Int, _ errorDescription: String?) -> Void) {
 
         let permission = NCUtility.shared.permissionsContainsString(metadata.permissions, permissions: NCGlobal.shared.permissionCanRename)
         if !(metadata.permissions == "") && !permission {
@@ -1315,7 +1315,7 @@ import Queuer
 
         let serverUrlFrom = metadata.serverUrl
         let serverUrlFileNameSource = metadata.serverUrl + "/" + metadata.fileName
-        let serverUrlFileNameDestination = serverUrlTo + "/" + metadata.fileName
+        let serverUrlFileNameDestination = metadataTo.serverUrl + "/" + metadata.fileName
 
         NCCommunication.shared.moveFileOrFolder(serverUrlFileNameSource: serverUrlFileNameSource, serverUrlFileNameDestination: serverUrlFileNameDestination, overwrite: overwrite) { account, errorCode, errorDescription in
 
@@ -1325,7 +1325,7 @@ import Queuer
                     NCManageDatabase.shared.deleteDirectoryAndSubDirectory(serverUrl: CCUtility.stringAppendServerUrl(metadata.serverUrl, addFileName: metadata.fileName), account: account)
                 }
 
-                NCManageDatabase.shared.moveMetadata(ocId: metadata.ocId, serverUrlTo: serverUrlTo)
+                NCManageDatabase.shared.moveMetadata(ocId: metadata.ocId, serverUrlTo: metadataTo.serverUrl)
 
                 NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterMoveFile, userInfo: ["ocId": metadata.ocId, "serverUrlFrom": serverUrlFrom])
             }
diff --git a/iOSClient/Networking/NCOperationQueue.swift b/iOSClient/Networking/NCOperationQueue.swift
index 6662c9eaf..8ed7901ed 100644
--- a/iOSClient/Networking/NCOperationQueue.swift
+++ b/iOSClient/Networking/NCOperationQueue.swift
@@ -255,7 +255,7 @@ class NCOperationCopyMove: ConcurrentOperation {
         let newMetadata = tableMetadata(value: metadata)
         newMetadata.serverUrl = serverUrlTo
         newMetadata.status = NCGlobal.shared.metadataStatusProccessingServer
-        newMetadata.ocId = UUID().uuidString
+        newMetadata.ocId = move ? metadata.ocId : UUID().uuidString
 
         if !overwrite {
             let newName = NCUtilityFileSystem.shared.createFileName(metadata.fileName, serverUrl: serverUrlTo, account: metadata.account)
@@ -282,7 +282,7 @@ class NCOperationCopyMove: ConcurrentOperation {
             self.finish()
         } else {
             if move {
-                NCNetworking.shared.moveMetadata(metadata, serverUrlTo: metadataTo.serverUrl, overwrite: overwrite) { errorCode, errorDescription in
+                NCNetworking.shared.moveMetadata(metadata, metadataTo: metadataTo, overwrite: overwrite) { errorCode, errorDescription in
                     if errorCode != 0 {
                         NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, errorCode: errorCode)
                     }
diff --git a/iOSClient/Viewer/NCViewer.swift b/iOSClient/Viewer/NCViewer.swift
index c27bbbd90..8b3eaea98 100644
--- a/iOSClient/Viewer/NCViewer.swift
+++ b/iOSClient/Viewer/NCViewer.swift
@@ -221,16 +221,16 @@ extension NCViewer: NCSelectDelegate {
     func dismissSelect(serverUrl: String?, metadata: tableMetadata?, type: String, items: [tableMetadata], overwrite: Bool, copy: Bool, move: Bool) {
         if let serverUrl = serverUrl {
             let metadata = items[0]
+            let newMetadata = tableMetadata(value: metadata)
+            newMetadata.serverUrl = serverUrl
             if move {
-                NCNetworking.shared.moveMetadata(metadata, serverUrlTo: serverUrl, overwrite: overwrite) { errorCode, errorDescription in
+                NCNetworking.shared.moveMetadata(metadata, metadataTo: newMetadata, overwrite: overwrite) { errorCode, errorDescription in
                     if errorCode != 0 {
 
                         NCContentPresenter.shared.messageNotification("_error_", description: errorDescription, delay: NCGlobal.shared.dismissAfterSecond, type: NCContentPresenter.messageType.error, errorCode: errorCode)
                     }
                 }
             } else if copy {
-                let newMetadata = tableMetadata(value: metadata)
-                newMetadata.serverUrl = serverUrl
                 NCNetworking.shared.copyMetadata(metadata, metadataTo: newMetadata, overwrite: overwrite) { errorCode, errorDescription in
                     if errorCode != 0 {