Fixed lint

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,29 +81,27 @@ 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
+    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
             }
-            path = newPath
+        } else {
+            null
         }
-    } else {
-        null
-    }
 
     override fun updateOperationForKeepBoth(operation: OfflineOperationEntity, newPath: String) {
         updateOperationPath(newPath, operation)

app/src/main/java/com/owncloud/android/ui/dialog/conflict/ConflictResolveDialogFactory.kt

@@ -24,14 +24,18 @@ import java.io.File
 
 object ConflictResolveDialogFactory {
 
-    fun forOffline(context: Context, leftFile: OfflineOperationEntity, rightFile: OCFile, user: User?):
-        ConflictsResolveDialog {
-
+    fun forOffline(
+        context: Context,
+        leftFile: OfflineOperationEntity,
+        rightFile: OCFile,
+        user: User?
+    ): ConflictsResolveDialog {
         val localFile =
-            if (leftFile.type is OfflineOperationType.CreateFile)
+            if (leftFile.type is OfflineOperationType.CreateFile) {
                 (leftFile.type as OfflineOperationType.CreateFile).localPath.toFile()
-            else
+            } else {
                 null
+            }
 
         val data = ConflictDialogData(
             headline = context.getString(R.string.choose_which_file),

app/src/main/res/values/strings.xml

@@ -1267,8 +1267,6 @@
     <string name="sync_not_enough_space_dialog_action_free_space">Free up space</string>
     <string name="sync_not_enough_space_dialog_placeholder">%1$s is %2$s, but there is only %3$s available on device.</string>
     <string name="sync_not_enough_space_dialog_title">Not enough space</string>
-    <string name="conflict_folder_headline">Folder conflict</string>
-    <string name="conflict_message_description_for_folder">If you select both versions, the local folder will have a number appended to its name.</string>
     <string name="conflict_message_description">If you select both versions, the local file will have a number appended to its name.</string>
     <string name="conflict_local_file">Local file</string>
     <string name="conflict_server_file">Server file</string>