浏览代码

Simplify checkInvalidCharacters

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 年之前
父节点
当前提交
7e85d80d8e
共有 1 个文件被更改,包括 8 次插入9 次删除
  1. 8 9
      app/src/main/java/com/nextcloud/utils/fileNameValidator/FileNameValidator.kt

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

@@ -58,17 +58,16 @@ object FileNameValidator {
     }
 
     private fun checkInvalidCharacters(name: String, capability: OCCapability, context: Context): String? {
-        if (capability.forbiddenFilenameCharacters.isTrue) {
-            val invalidCharacter = name.find {
-                it.toString().matches(reservedWindowsChars) ||
-                    it.toString().matches(reservedUnixChars)
-            }
-            if (invalidCharacter != null) {
-                return context.getString(R.string.file_name_validator_error_invalid_character, invalidCharacter)
-            }
+        if (capability.forbiddenFilenameCharacters.isFalse) return null
+
+        val invalidCharacter = name.find {
+            val input = it.toString()
+            input.matches(reservedWindowsChars) || input.matches(reservedUnixChars)
         }
 
-        return null
+        if (invalidCharacter == null) return null
+
+        return context.getString(R.string.file_name_validator_error_invalid_character, invalidCharacter)
     }
 
     fun isFileHidden(name: String): Boolean = !TextUtils.isEmpty(name) && name[0] == '.'