Don't allow invalid characters in filename pattern

Fixes FossifyOrg/File-Manager#47
FossifyOrg · Mar 15, 2024 · 27749aa · 27749aa
1 parent 60ddae2
commit 27749aa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/commons/src/main/kotlin/org/fossify/commons/extensions/String.kt b/commons/src/main/kotlin/org/fossify/commons/extensions/String.kt
@@ -71,11 +71,12 @@ fun String.getFirstParentPath(context: Context, level: Int): String {
 }
 
 fun String.isAValidFilename(): Boolean {
-    val ILLEGAL_CHARACTERS = charArrayOf('/', '\n', '\r', '\t', '\u0000', '`', '?', '*', '\\', '<', '>', '|', '\"', ':')
-    ILLEGAL_CHARACTERS.forEach {
-        if (contains(it))
-            return false
-    }
+    charArrayOf('/', '\n', '\r', '\t', '\u0000', '`', '?', '*', '\\', '<', '>', '|', '\"', ':')
+        .forEach {
+            if (contains(it))
+                return false
+        }
+
     return true
 }
 

diff --git a/commons/src/main/kotlin/org/fossify/commons/views/RenamePatternTab.kt b/commons/src/main/kotlin/org/fossify/commons/views/RenamePatternTab.kt
@@ -54,6 +54,11 @@ class RenamePatternTab(context: Context, attrs: AttributeSet) : RelativeLayout(c
             return
         }
 
+        if (!newNameRaw.isAValidFilename()) {
+            activity?.toast(R.string.invalid_name)
+            return
+        }
+
         val validPaths = paths.filter { activity?.getDoesFilePathExist(it) == true }
         val firstPath = validPaths.firstOrNull()
         val sdFilePath = validPaths.firstOrNull { activity?.isPathOnSD(it) == true } ?: firstPath
@@ -180,7 +185,7 @@ class RenamePatternTab(context: Context, attrs: AttributeSet) : RelativeLayout(c
         paths: List<String>,
         useMediaFileExtension: Boolean,
         android30Format: Android30RenameFormat,
-        callback: (success: Boolean) -> Unit
+        callback: (success: Boolean) -> Unit,
     ) {
         val fileDirItems = paths.map { File(it).toFileDirItem(context) }
         val uriPairs = context.getUrisPathsFromFileDirItems(fileDirItems)