mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Handle SecurityException in case of multi-upload

Browse source
This commit is contained in:
Ritika Pahwa 2025-08-16 18:54:42 +05:30
parent 970d38ecc2
commit 556952e3b1
1 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.kt
View file

@ -12,6 +12,7 @@ import androidx.preference.PreferenceManager
import fr.free.nrw.commons.customselector.model.Image import fr.free.nrw.commons.customselector.model.Image
import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivity import fr.free.nrw.commons.customselector.ui.selector.CustomSelectorActivity
import fr.free.nrw.commons.filepicker.PickedFiles.singleFileList import fr.free.nrw.commons.filepicker.PickedFiles.singleFileList
import timber.log.Timber
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.net.URISyntaxException import java.net.URISyntaxException
@ -296,12 +297,24 @@ object FilePicker : Constants {
* https://github.com/commons-app/apps-android-commons/issues/6357 * https://github.com/commons-app/apps-android-commons/issues/6357
*/ */
private fun takePersistableUriPermissions(context: Context, result: ActivityResult) { private fun takePersistableUriPermissions(context: Context, result: ActivityResult) {
result.data?.data?.also { uri -> val intent = result.data
val takeFlags: Int = (Intent.FLAG_GRANT_READ_URI_PERMISSION val takeFlags: Int = (Intent.FLAG_GRANT_READ_URI_PERMISSION
or Intent.FLAG_GRANT_WRITE_URI_PERMISSION) or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
intent?.let {
val urisToPersist = mutableListOf<Uri>()
it.clipData?.let { clipData ->
for (i in 0 until clipData.itemCount) {
urisToPersist.add(clipData.getItemAt(i).uri)
}
} ?: it.data?.let { uri ->
urisToPersist.add(uri)
}
urisToPersist.forEach { uri ->
context.contentResolver.takePersistableUriPermission(uri, takeFlags) context.contentResolver.takePersistableUriPermission(uri, takeFlags)
} }
} }
}
/** /**
* onPictureReturnedFromCustomSelector. * onPictureReturnedFromCustomSelector.