Эх сурвалжийг харах

Remove version check for test separately

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 9 сар өмнө
parent
commit
072b59ec5f

+ 8 - 12
app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt

@@ -55,13 +55,12 @@ object FileNameValidator {
             }
 
             capability.run {
+                val filenameVariants = setOf(filename.lowercase(), filename.removeFileExtension().lowercase())
+
                 forbiddenFilenameBaseNames().let {
-                    val forbiddenFilenameBaseNames = capability.forbiddenFilenameBaseNames().map { it.lowercase() }
+                    val forbiddenBaseNames = forbiddenFilenameBaseNames().map { it.lowercase() }
 
-                    if (forbiddenFilenameBaseNames.contains(filename.lowercase()) || forbiddenFilenameBaseNames.contains(
-                            filename.removeFileExtension().lowercase()
-                        )
-                    ) {
+                    if (forbiddenBaseNames.any { it in filenameVariants }) {
                         return context.getString(
                             R.string.file_name_validator_error_reserved_names,
                             filename.substringBefore(StringConstants.DOT)
@@ -70,12 +69,9 @@ object FileNameValidator {
                 }
 
                 forbiddenFilenamesJson?.let {
-                    val forbiddenFilenames = capability.forbiddenFilenames().map { it.lowercase() }
+                    val forbiddenFilenames = forbiddenFilenames().map { it.lowercase() }
 
-                    if (forbiddenFilenames.contains(filename.uppercase()) || forbiddenFilenames.contains(
-                            filename.removeFileExtension().uppercase()
-                        )
-                    ) {
+                    if (forbiddenFilenames.any { it in filenameVariants }) {
                         return context.getString(
                             R.string.file_name_validator_error_reserved_names,
                             filename.substringBefore(StringConstants.DOT)
@@ -84,9 +80,9 @@ object FileNameValidator {
                 }
 
                 forbiddenFilenameExtensionJson?.let {
-                    val forbiddenFilenameExtension = capability.forbiddenFilenameExtension()
+                    val forbiddenExtensions = forbiddenFilenameExtension()
 
-                    if (forbiddenFilenameExtension.any { filename.endsWith(it, ignoreCase = true) }) {
+                    if (forbiddenExtensions.any { filename.endsWith(it, ignoreCase = true) }) {
                         return context.getString(
                             R.string.file_name_validator_error_forbidden_file_extensions,
                             filename.substringAfter(StringConstants.DOT)