From bca1844403c961eaec189d2810535c75bec98ab8 Mon Sep 17 00:00:00 2001
From: agarcia <agarcia@solidgeargroup.com>
Date: Wed, 5 Aug 2020 14:00:48 +0200
Subject: [PATCH] Apply code review suggestions

---
 .../files/CreateRemoteFolderOperation.kt      | 22 +++++++++++++------
 .../resources/files/services/FileService.kt   | 18 ++++++++++++---
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.kt
index f5c8176d..372c8f21 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/CreateRemoteFolderOperation.kt
@@ -56,6 +56,7 @@ class CreateRemoteFolderOperation(
             result = createParentFolder(FileUtils.getParentPath(remotePath), client)
 
             if (result.isSuccess) {
+                // Second and last try
                 result = createFolder(client)
             }
         }
@@ -65,25 +66,32 @@ class CreateRemoteFolderOperation(
     private fun createFolder(client: OwnCloudClient): RemoteOperationResult<Unit> {
         var result: RemoteOperationResult<Unit>
         try {
-            val webDavUri = if (isChunksFolder) client.uploadsWebDavUri else client.userFilesWebDavUri
-            val mkcol = MkColMethod(URL(webDavUri.toString() + WebdavUtils.encodePath(remotePath))).apply {
+            val webDavUri = if (isChunksFolder) {
+                client.uploadsWebDavUri
+            } else {
+                client.userFilesWebDavUri
+            }
+
+            val mkCol = MkColMethod(
+                URL(webDavUri.toString() + WebdavUtils.encodePath(remotePath))
+            ).apply {
                 setReadTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
                 setConnectionTimeout(CONNECTION_TIMEOUT, TimeUnit.SECONDS)
             }
 
-            val status = client.executeHttpMethod(mkcol)
+            val status = client.executeHttpMethod(mkCol)
             result =
                 if (status == HttpConstants.HTTP_CREATED) {
-                    RemoteOperationResult<Unit>(ResultCode.OK)
+                    RemoteOperationResult(ResultCode.OK)
                 } else {
-                    RemoteOperationResult<Unit>(mkcol)
+                    RemoteOperationResult(mkCol)
                 }
 
             Timber.d("Create directory $remotePath: ${result.logMessage}")
-            client.exhaustResponse(mkcol.getResponseBodyAsStream())
+            client.exhaustResponse(mkCol.getResponseBodyAsStream())
 
         } catch (e: Exception) {
-            result = RemoteOperationResult<Unit>(e)
+            result = RemoteOperationResult(e)
             Timber.e(e, "Create directory $remotePath: ${result.logMessage}")
         }
         return result
diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt
index 00547f5c..904496c0 100644
--- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt
+++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/files/services/FileService.kt
@@ -28,8 +28,20 @@ import com.owncloud.android.lib.resources.Service
 import com.owncloud.android.lib.resources.files.RemoteFile
 
 interface FileService : Service {
-    fun checkPathExistence(path: String, isUserLogged: Boolean): RemoteOperationResult<Boolean>
     fun getUrlToOpenInWeb(openWebEndpoint: String, fileId: String): RemoteOperationResult<String>
-    fun createFolder(remotePath: String, createFullPath: Boolean, isChunkFolder: Boolean = false): RemoteOperationResult<Unit>
-    fun refreshFolder(remotePath: String): RemoteOperationResult<ArrayList<RemoteFile>>
+
+    fun checkPathExistence(
+        path: String,
+        isUserLogged: Boolean
+    ): RemoteOperationResult<Boolean>
+
+    fun createFolder(
+        remotePath: String,
+        createFullPath: Boolean,
+        isChunkFolder: Boolean = false
+    ): RemoteOperationResult<Unit>
+
+    fun refreshFolder(
+        remotePath: String
+    ): RemoteOperationResult<ArrayList<RemoteFile>>
 }