Merge pull request #13606 from nextcloud/bugfix/check-file-name-not-p…

…ath-in-uri-uploader BugFix - Check Filename in UriUploader
nextcloud · Sep 24, 2024 · d4ea700 · d4ea700
2 parents 4ecdf79 + 08024d5
commit d4ea700
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt b/app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
@@ -25,6 +25,7 @@ import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask
 import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener
 import com.owncloud.android.ui.fragment.TaskRetainerFragment
 import com.owncloud.android.utils.UriUtils.getDisplayNameForUri
+import java.io.File
 
 /**
  * This class examines URIs pointing to files to upload and then requests [FileUploadHelper] to upload them.
@@ -79,9 +80,12 @@ class UriUploader(
                     .filterNotNull()
                     .map { it as Uri }
                     .map { Pair(it, getRemotePathForUri(it)) }
-                    .filter { (_, filename) ->
+                    .filter { (_, path) ->
+                        val file = File(path)
+                        val filename = file.name
+
                         isFilenameValid = FileNameValidator.checkFileName(
-                            filename.removePrefix("/"),
+                            filename,
                             mActivity.capabilities,
                             mActivity,
                             null