Applied suggestions from PR

Signed-off-by: daniele-verducci <daniele.verducci@nextcloud.com>

Author: daniele-verducci

app/src/main/java/com/nextcloud/client/jobs/offlineOperations/repository/OfflineOperationsRepository.kt

@@ -81,28 +81,21 @@ class OfflineOperationsRepository(private val fileDataStorageManager: FileDataSt
             .forEach { dao.update(it) }
     }
 
-    private fun updateOperationPath(newPath: String, nextOperation: OfflineOperationEntity): OfflineOperationEntity? =
-        if (newPath != nextOperation.path) {
-            nextOperation.apply {
-                type = when (type) {
-                    is OfflineOperationType.CreateFile ->
-                        (type as OfflineOperationType.CreateFile).copy(
-                            remotePath = newPath
-                        )
-
-                    is OfflineOperationType.CreateFolder ->
-                        (type as OfflineOperationType.CreateFolder).copy(
-                            path = newPath
-                        )
-
-                    else -> type
-                }
-                path = newPath
-            }
-        } else {
-            null
+    private fun updateOperationPath(newPath: String, nextOperation: OfflineOperationEntity): OfflineOperationEntity? {
+        if (newPath == nextOperation.path) return null
+
+        val updatedType = when (val currentType = nextOperation.type) {
+            is OfflineOperationType.CreateFile -> currentType.copy(remotePath = newPath)
+            is OfflineOperationType.CreateFolder -> currentType.copy(path = newPath)
+            else -> currentType
         }
 
+        return nextOperation.apply {
+            type = updatedType
+            path = newPath
+        }
+    }
+
     override fun updateOperationForKeepBoth(operation: OfflineOperationEntity, newPath: String) {
         updateOperationPath(newPath, operation)
         dao.update(operation)

app/src/main/java/com/owncloud/android/datamodel/FileDataStorageManager.java

@@ -242,8 +242,8 @@ public void createPendingFile(
         final OCFile existingFile = getFileByRemotePath(remotePath);
         final File localFile = FileExtensionsKt.toFile(localPath);
         if (FileExtensionsKt.isTheSameAs(existingFile, localFile)) {
-            // In case the same file was already uploaded, do not overwrite it to avoid triggering a conflict
-            Log_OC.i(TAG, "Creating pendingFile for an already uploaded file: keeping metadata");
+            Log_OC.i(TAG, "Creating pendingFile for an already uploaded file: " +
+                "keeping metadata to avoid triggering a conflict");
             return;
         }