mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 05:05:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #13606 from nextcloud/bugfix/check-file-name-not-path-in-uri-uploader

Browse source 
BugFix - Check Filename in UriUploader
This commit is contained in:
Alper Öztürk 2024-09-24 09:04:56 +02:00 committed by GitHub
commit d4ea700b1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt
View file

@ -25,6 +25,7 @@ import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask
import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener import com.owncloud.android.ui.asynctasks.CopyAndUploadContentUrisTask.OnCopyTmpFilesTaskListener
import com.owncloud.android.ui.fragment.TaskRetainerFragment import com.owncloud.android.ui.fragment.TaskRetainerFragment
import com.owncloud.android.utils.UriUtils.getDisplayNameForUri 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. * This class examines URIs pointing to files to upload and then requests [FileUploadHelper] to upload them.
@ -79,9 +80,12 @@ class UriUploader(
.filterNotNull() .filterNotNull()
.map { it as Uri } .map { it as Uri }
.map { Pair(it, getRemotePathForUri(it)) } .map { Pair(it, getRemotePathForUri(it)) }
.filter { (_, filename) -> .filter { (_, path) ->
val file = File(path)
val filename = file.name
isFilenameValid = FileNameValidator.checkFileName( isFilenameValid = FileNameValidator.checkFileName(
filename.removePrefix("/"), filename,
mActivity.capabilities, mActivity.capabilities,
mActivity, mActivity,
null null