Simplify return

Signed-off-by: alperozturk <[email protected]>
nextcloud · Sep 24, 2024 · 2cbd36b · 2cbd36b
1 parent 9724c5d
commit 2cbd36b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/app/src/main/java/com/nextcloud/utils/autoRename/AutoRename.kt b/app/src/main/java/com/nextcloud/utils/autoRename/AutoRename.kt
@@ -10,7 +10,7 @@ package com.nextcloud.utils.autoRename
 import com.nextcloud.utils.extensions.StringConstants
 import com.nextcloud.utils.extensions.forbiddenFilenameCharacters
 import com.nextcloud.utils.extensions.forbiddenFilenameExtension
-import com.nextcloud.utils.extensions.shouldRemoveNonPrintableUnicodeCharacters
+import com.nextcloud.utils.extensions.shouldRemoveNonPrintableUnicodeCharactersAndConvertToUTF8
 import com.owncloud.android.datamodel.OCFile
 import com.owncloud.android.lib.resources.status.NextcloudVersion
 import com.owncloud.android.lib.resources.status.OCCapability
@@ -65,14 +65,13 @@ object AutoRename {
             }
         }
 
-        var result = pathSegments.joinToString(OCFile.PATH_SEPARATOR)
-
-        if (capability.shouldRemoveNonPrintableUnicodeCharacters()) {
+        val result = pathSegments.joinToString(OCFile.PATH_SEPARATOR)
+        return if (capability.shouldRemoveNonPrintableUnicodeCharactersAndConvertToUTF8()) {
             val utf8Result = convertToUTF8(result)
-            result = removeNonPrintableUnicodeCharacters(utf8Result)
+            removeNonPrintableUnicodeCharacters(utf8Result)
+        } else {
+            result
         }
-
-        return result
     }
 
     private fun convertToUTF8(filename: String): String {

diff --git a/app/src/main/java/com/nextcloud/utils/extensions/OCCapabilityExtensions.kt b/app/src/main/java/com/nextcloud/utils/extensions/OCCapabilityExtensions.kt
@@ -21,7 +21,7 @@ fun OCCapability.forbiddenFilenameExtension(): List<String> = jsonToList(forbidd
 
 fun OCCapability.forbiddenFilenameBaseNames(): List<String> = jsonToList(forbiddenFilenameBaseNamesJson)
 
-fun OCCapability.shouldRemoveNonPrintableUnicodeCharacters(): Boolean {
+fun OCCapability.shouldRemoveNonPrintableUnicodeCharactersAndConvertToUTF8(): Boolean {
     return forbiddenFilenames().isNotEmpty() ||
         forbiddenFilenameCharacters().isNotEmpty() ||
         forbiddenFilenameExtension().isNotEmpty() ||