Skip to content

Commit 6de6620

Browse files
Fix lint
Signed-off-by: daniele-verducci <daniele.verducci@nextcloud.com>
1 parent 870ec84 commit 6de6620

3 files changed

Lines changed: 22 additions & 9 deletions

File tree

app/src/main/java/com/nextcloud/utils/extensions/FileDataStorageManagerExtensions.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,25 +196,28 @@ fun FileDataStorageManager.moveFiles(ocFile: OCFile?, targetPath: String, target
196196
*
197197
* @return the new remote path, or null if the user is unauthorized in the provided path
198198
*/
199+
@Suppress("ReturnCount")
199200
fun getRemotePathForConflictResolution(client: OwnCloudClient, remotePath: String, fileName: String): String? {
200201
val newName = generateFileNameForConflictResolution(fileName)
201202
val newPath = "$remotePath$newName"
202203

203204
// Check if new name exists
204205
val operation = ExistenceCheckRemoteOperation(newPath, false)
205206
val existence = RemoteFileExistence.fromExistenceCheck(operation.execute(client))
206-
if (existence == RemoteFileExistence.UNAUTHORIZED)
207+
if (existence == RemoteFileExistence.UNAUTHORIZED) {
207208
return null
208-
if (existence == RemoteFileExistence.DOES_NOT_EXIST)
209+
}
210+
if (existence == RemoteFileExistence.DOES_NOT_EXIST) {
209211
return newPath
212+
}
210213
return getRemotePathForConflictResolution(client, remotePath, newName)
211214
}
212215

213216
fun generateFileNameForConflictResolution(fileName: String): String {
214217
val isFolder = fileName.endsWith(OCFile.PATH_SEPARATOR)
215218
val separator = if (isFolder) OCFile.PATH_SEPARATOR else "."
216219
var nameFirstPart = fileName.substringBeforeLast(separator)
217-
var nameLastPart = fileName.substringAfterLast(separator, "") // Extension or path separator
220+
var nameLastPart = fileName.substringAfterLast(separator, "") // Extension or path separator
218221
if (nameLastPart.isNotEmpty()) nameLastPart = "$separator$nameLastPart"
219222
val regex = Regex("""(.*)\((\d+)\)$""", RegexOption.MULTILINE)
220223
if (regex.matches(nameFirstPart)) {

app/src/main/java/com/nextcloud/utils/extensions/FileExtensions.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* SPDX-License-Identifier: AGPL-3.0-or-later
66
*/
77

8+
@Suppress("TooManyFunctions")
89
package com.nextcloud.utils.extensions
910

1011
import android.graphics.Bitmap
@@ -22,6 +23,7 @@ import java.nio.file.Files
2223
import java.nio.file.Path
2324
import java.nio.file.attribute.BasicFileAttributes
2425

26+
2527
private const val TAG = "FileExtensions"
2628
private const val MS_IN_SECOND = 1000
2729

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,25 @@ object ConflictResolveDialogFactory {
4242

4343
val data = ConflictDialogData(
4444
headline = context.getString(
45-
if (isFolderConflict) R.string.conflict_folder_headline
46-
else R.string.choose_which_file
45+
if (isFolderConflict) {
46+
R.string.conflict_folder_headline
47+
} else {
48+
R.string.choose_which_file
49+
}
4750
),
4851
description = context.getString(
49-
if (isFolderConflict) R.string.conflict_message_description_for_folder
50-
else R.string.conflict_message_description
52+
if (isFolderConflict) {
53+
R.string.conflict_message_description_for_folder
54+
} else {
55+
R.string.conflict_message_description
56+
}
5157
),
5258
localFile = context.conflictFileData(
5359
titleId = R.string.conflict_local_file,
54-
timestamp = (offlineCreatedLocalFile?.lastModified()
55-
?: leftFile.createdAt?.times(SECONDS_TO_MILLIS) ?: 0L),
60+
timestamp = (
61+
offlineCreatedLocalFile?.lastModified()
62+
?: leftFile.createdAt?.times(SECONDS_TO_MILLIS) ?: 0L
63+
),
5664
fileLength = (offlineCreatedLocalFile?.length() ?: 0L)
5765
),
5866
serverFile = context.conflictFileData(R.string.prefs_synced_folders_remote_path_title, rightFile)

0 commit comments

Comments
 (0)