Merge pull request #571 from owncloud/feature/copy_move_conflic_solved_users

[FEATURE REQUEST] Copy/move conflict solved by users

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/CopyMethod.kt

@@ -36,7 +36,7 @@ import java.net.URL
 class CopyMethod(
     val url: URL,
     private val destinationUrl: String,
-    private val forceOverride: Boolean = false
+    val forceOverride: Boolean = false
 ) : DavMethod(url) {
     @Throws(Exception::class)
     public override fun onDavExecute(davResource: DavOCResource): Int {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/methods/webdav/MoveMethod.kt

@@ -36,7 +36,7 @@ import java.net.URL
 class MoveMethod(
     url: URL,
     private val destinationUrl: String,
-    private val forceOverride: Boolean = false
+    val forceOverride: Boolean = false
 ) : DavMethod(url) {
     @Throws(Exception::class)
     override fun onDavExecute(davResource: DavOCResource): Int {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CopyRemoteFileOperation.kt

@@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit
  * @author Christian Schabesberger
  * @author David González V.
  * @author Juan Carlos Garrote Gascón
+ * @author Manuel Plazas Palacio
  *
  * @param sourceRemotePath    Remote path of the file/folder to copy.
  * @param targetRemotePath Remote path desired for the file/folder to copy it.
@@ -54,6 +55,7 @@ class CopyRemoteFileOperation(
     private val targetRemotePath: String,
     private val sourceSpaceWebDavUrl: String? = null,
     private val targetSpaceWebDavUrl: String? = null,
+    private val forceOverride: Boolean = false,
 ) : RemoteOperation<String>() {
 
     /**
@@ -74,9 +76,11 @@ class CopyRemoteFileOperation(
         var result: RemoteOperationResult<String>
         try {
             val copyMethod = CopyMethod(
-                URL((sourceSpaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(sourceRemotePath)),
+                url = URL((sourceSpaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(sourceRemotePath)),
-                (targetSpaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(targetRemotePath),
+                destinationUrl = (targetSpaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(targetRemotePath),
+                forceOverride = forceOverride,
             ).apply {
+                addRequestHeaders(this)
                 setReadTimeout(COPY_READ_TIMEOUT, TimeUnit.SECONDS)
                 setConnectionTimeout(COPY_CONNECTION_TIMEOUT, TimeUnit.SECONDS)
             }
@@ -87,6 +91,7 @@ class CopyRemoteFileOperation(
                     result = RemoteOperationResult(ResultCode.OK)
                     result.setData(fileRemoteId)
                 }
+
                 isPreconditionFailed(status) -> {
                     result = RemoteOperationResult(ResultCode.INVALID_OVERWRITE)
                     client.exhaustResponse(copyMethod.getResponseBodyAsStream())
@@ -94,6 +99,7 @@ class CopyRemoteFileOperation(
                     /// for other errors that could be explicitly handled, check first:
                     /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
                 }
+
                 else -> {
                     result = RemoteOperationResult(copyMethod)
                     client.exhaustResponse(copyMethod.getResponseBodyAsStream())
@@ -107,6 +113,13 @@ class CopyRemoteFileOperation(
         return result
     }
 
+    private fun addRequestHeaders(copyMethod: CopyMethod) {
+        //Adding this because the library has an error with override
+        if (copyMethod.forceOverride) {
+            copyMethod.setRequestHeader(OVERWRITE, TRUE)
+        }
+    }
+
     private fun isSuccess(status: Int) = status.isOneOf(HttpConstants.HTTP_CREATED, HttpConstants.HTTP_NO_CONTENT)
 
     private fun isPreconditionFailed(status: Int) = status == HttpConstants.HTTP_PRECONDITION_FAILED
@@ -114,5 +127,7 @@ class CopyRemoteFileOperation(
     companion object {
         private const val COPY_READ_TIMEOUT = 10L
         private const val COPY_CONNECTION_TIMEOUT = 6L
+        private const val OVERWRITE = "overwrite"
+        private const val TRUE = "T"
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/MoveRemoteFileOperation.kt

@@ -46,6 +46,7 @@ import java.util.concurrent.TimeUnit
  * @author David González Verdugo
  * @author Abel García de Prada
  * @author Juan Carlos Garrote Gascón
+ * @author Manuel Plazas Palacio
  *
  * @param sourceRemotePath  Remote path of the file/folder to copy.
  * @param targetRemotePath  Remote path desired for the file/folder to copy it.
@@ -54,6 +55,7 @@ open class MoveRemoteFileOperation(
     private val sourceRemotePath: String,
     private val targetRemotePath: String,
     private val spaceWebDavUrl: String? = null,
+    private val forceOverride: Boolean = false,
 ) : RemoteOperation<Unit>() {
 
     /**
@@ -80,6 +82,7 @@ open class MoveRemoteFileOperation(
             val moveMethod = MoveMethod(
                 url = URL((spaceWebDavUrl ?: srcWebDavUri.toString()) + WebdavUtils.encodePath(sourceRemotePath)),
                 destinationUrl = (spaceWebDavUrl ?: client.userFilesWebDavUri.toString()) + WebdavUtils.encodePath(targetRemotePath),
+                forceOverride = forceOverride,
             ).apply {
                 addRequestHeaders(this)
                 setReadTimeout(MOVE_READ_TIMEOUT, TimeUnit.SECONDS)
@@ -92,6 +95,7 @@ open class MoveRemoteFileOperation(
                 isSuccess(status) -> {
                     result = RemoteOperationResult<Unit>(ResultCode.OK)
                 }
+
                 isPreconditionFailed(status) -> {
                     result = RemoteOperationResult<Unit>(ResultCode.INVALID_OVERWRITE)
                     client.exhaustResponse(moveMethod.getResponseBodyAsStream())
@@ -99,6 +103,7 @@ open class MoveRemoteFileOperation(
                     /// for other errors that could be explicitly handled, check first:
                     /// http://www.webdav.org/specs/rfc4918.html#rfc.section.9.9.4
                 }
+
                 else -> {
                     result = RemoteOperationResult<Unit>(moveMethod)
                     client.exhaustResponse(moveMethod.getResponseBodyAsStream())
@@ -125,6 +130,10 @@ open class MoveRemoteFileOperation(
      * In case new headers are needed, override this method
      */
     open fun addRequestHeaders(moveMethod: MoveMethod) {
+        //Adding this because the library has an error with override
+        if (moveMethod.forceOverride) {
+            moveMethod.setRequestHeader(OVERWRITE, TRUE)
+        }
     }
 
     private fun isSuccess(status: Int) = status.isOneOf(HttpConstants.HTTP_CREATED, HttpConstants.HTTP_NO_CONTENT)
@@ -134,5 +143,7 @@ open class MoveRemoteFileOperation(
     companion object {
         private const val MOVE_READ_TIMEOUT = 10L
         private const val MOVE_CONNECTION_TIMEOUT = 6L
+        private const val OVERWRITE = "overwrite"
+        private const val TRUE = "T"
     }
 }

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt

@@ -39,7 +39,8 @@ interface FileService : Service {
         targetRemotePath: String,
         sourceSpaceWebDavUrl: String?,
         targetSpaceWebDavUrl: String?,
-    ): RemoteOperationResult<String>
+        replace: Boolean,
+    ): RemoteOperationResult<String?>
 
     fun createFolder(
         remotePath: String,
@@ -57,6 +58,7 @@ interface FileService : Service {
         sourceRemotePath: String,
         targetRemotePath: String,
         spaceWebDavUrl: String?,
+        replace: Boolean,
     ): RemoteOperationResult<Unit>
 
     fun readFile(

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/implementation/OCFileService.kt

@@ -54,12 +54,14 @@ class OCFileService(override val client: OwnCloudClient) : FileService {
         targetRemotePath: String,
         sourceSpaceWebDavUrl: String?,
         targetSpaceWebDavUrl: String?,
-    ): RemoteOperationResult<String> =
+        replace: Boolean,
+    ): RemoteOperationResult<String?> =
         CopyRemoteFileOperation(
             sourceRemotePath = sourceRemotePath,
             targetRemotePath = targetRemotePath,
             sourceSpaceWebDavUrl = sourceSpaceWebDavUrl,
             targetSpaceWebDavUrl = targetSpaceWebDavUrl,
+            forceOverride = replace,
         ).execute(client)
 
     override fun createFolder(
@@ -88,11 +90,13 @@ class OCFileService(override val client: OwnCloudClient) : FileService {
         sourceRemotePath: String,
         targetRemotePath: String,
         spaceWebDavUrl: String?,
+        replace: Boolean,
     ): RemoteOperationResult<Unit> =
         MoveRemoteFileOperation(
             sourceRemotePath = sourceRemotePath,
             targetRemotePath = targetRemotePath,
             spaceWebDavUrl = spaceWebDavUrl,
+            forceOverride = replace,
         ).execute(client)
 
     override fun readFile(