Skip to content

fix(storage): resolve MediaStore URIs before scoped requests #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sjug wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(storage): resolve MediaStore URIs before scoped requests #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aa378e
fix(storage): resolve MediaStore URIs before scoped requests
sjug Apr 29, 2026
7fcaa53
style: satisfy detekt for scoped storage changes
sjug Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
150 changes: 80 additions & 70 deletions commons/src/main/kotlin/org/fossify/commons/activities/BaseSimpleActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import org.fossify.commons.extensions.getColoredDrawableWithColor
import org.fossify.commons.extensions.getContrastColor
import org.fossify.commons.extensions.getCurrentFormattedDateTime
import org.fossify.commons.extensions.getDoesFilePathExist
import org.fossify.commons.extensions.getFileUrisFromFileDirItems
import org.fossify.commons.extensions.resolveMediaStoreUris
import org.fossify.commons.extensions.getFirstParentLevel
import org.fossify.commons.extensions.getFirstParentPath
import org.fossify.commons.extensions.getPermissionString
Expand Down Expand Up @@ -546,16 +546,22 @@ abstract class BaseSimpleActivity : EdgeToEdgeActivity() {
val outputStream = contentResolver.openOutputStream(resultData.data!!)
exportSettingsTo(outputStream, configItemsToExport)
} else if (requestCode == DELETE_FILE_SDK_30_HANDLER) {
funAfterSdk30Action?.invoke(resultCode == RESULT_OK)
val funAfter = funAfterSdk30Action
funAfterSdk30Action = null
funAfter?.invoke(resultCode == RESULT_OK)
} else if (requestCode == RECOVERABLE_SECURITY_HANDLER) {
funRecoverableSecurity?.invoke(resultCode == RESULT_OK)
funRecoverableSecurity = null
} else if (requestCode == UPDATE_FILE_SDK_30_HANDLER) {
funAfterUpdate30File?.invoke(resultCode == RESULT_OK)
val funAfter = funAfterUpdate30File
funAfterUpdate30File = null
funAfter?.invoke(resultCode == RESULT_OK)
} else if (requestCode == MANAGE_MEDIA_RC) {
funAfterManageMediaPermission?.invoke()
} else if (requestCode == TRASH_FILE_SDK_30_HANDLER) {
funAfterTrash30File?.invoke(resultCode == RESULT_OK)
val funAfter = funAfterTrash30File
funAfterTrash30File = null
funAfter?.invoke(resultCode == RESULT_OK)
}
}

Expand Down Expand Up @@ -788,16 +794,19 @@ abstract class BaseSimpleActivity : EdgeToEdgeActivity() {
@SuppressLint("NewApi")
fun deleteSDK30Uris(uris: List<Uri>, callback: (success: Boolean) -> Unit) {
hideKeyboard()
if (isRPlus()) {
funAfterSdk30Action = callback
try {
val deleteRequest =
MediaStore.createDeleteRequest(contentResolver, uris).intentSender
startIntentSenderForResult(deleteRequest, DELETE_FILE_SDK_30_HANDLER, null, 0, 0, 0)
} catch (e: Exception) {
showErrorToast(e)
}
} else {
if (!isRPlus() || uris.isEmpty()) {
callback(false)
return
}

funAfterSdk30Action = callback
try {
val deleteRequest =
MediaStore.createDeleteRequest(contentResolver, uris).intentSender
startIntentSenderForResult(deleteRequest, DELETE_FILE_SDK_30_HANDLER, null, 0, 0, 0)
} catch (e: Exception) {
funAfterSdk30Action = null
showErrorToast(e)
callback(false)
}
}
Expand All @@ -809,16 +818,19 @@ abstract class BaseSimpleActivity : EdgeToEdgeActivity() {
callback: (success: Boolean) -> Unit
) {
hideKeyboard()
if (isRPlus()) {
funAfterTrash30File = callback
try {
val trashRequest =
MediaStore.createTrashRequest(contentResolver, uris, toTrash).intentSender
startIntentSenderForResult(trashRequest, TRASH_FILE_SDK_30_HANDLER, null, 0, 0, 0)
} catch (e: Exception) {
showErrorToast(e)
}
} else {
if (!isRPlus() || uris.isEmpty()) {
callback(false)
return
}

funAfterTrash30File = callback
try {
val trashRequest =
MediaStore.createTrashRequest(contentResolver, uris, toTrash).intentSender
startIntentSenderForResult(trashRequest, TRASH_FILE_SDK_30_HANDLER, null, 0, 0, 0)
} catch (e: Exception) {
funAfterTrash30File = null
showErrorToast(e)
callback(false)
}
}
Expand All @@ -829,15 +841,18 @@ abstract class BaseSimpleActivity : EdgeToEdgeActivity() {
callback: (success: Boolean) -> Unit
) {
hideKeyboard()
if (isRPlus()) {
funAfterUpdate30File = callback
try {
val writeRequest = MediaStore.createWriteRequest(contentResolver, uris).intentSender
startIntentSenderForResult(writeRequest, UPDATE_FILE_SDK_30_HANDLER, null, 0, 0, 0)
} catch (e: Exception) {
showErrorToast(e)
}
} else {
if (!isRPlus() || uris.isEmpty()) {
callback(false)
return
}

funAfterUpdate30File = callback
try {
val writeRequest = MediaStore.createWriteRequest(contentResolver, uris).intentSender
startIntentSenderForResult(writeRequest, UPDATE_FILE_SDK_30_HANDLER, null, 0, 0, 0)
} catch (e: Exception) {
funAfterUpdate30File = null
showErrorToast(e)
callback(false)
}
}
Expand Down Expand Up @@ -912,29 +927,41 @@ abstract class BaseSimpleActivity : EdgeToEdgeActivity() {

copyMoveCallback = callback
var fileCountToCopy = fileDirItems.size
if (isCopyOperation) {
val recycleBinPath = fileDirItems.first().isRecycleBinPath(this)
if (canManageMedia() && !recycleBinPath) {
val fileUris = getFileUrisFromFileDirItems(fileDirItems)

fun startCopyMoveNow() {
startCopyMove(
files = fileDirItems,
destinationPath = destination,
isCopyOperation = isCopyOperation,
copyPhotoVideoOnly = copyPhotoVideoOnly,
copyHidden = copyHidden
)
}

fun requestSdk30UpdateThenStart() {
resolveMediaStoreUris(fileDirItems) { resolution ->
val fileUris = resolution.uris
if (fileUris.isEmpty()) {
startCopyMoveNow()
return@resolveMediaStoreUris
}

updateSDK30Uris(fileUris) { sdk30UriSuccess ->
if (sdk30UriSuccess) {
startCopyMove(
files = fileDirItems,
destinationPath = destination,
isCopyOperation = isCopyOperation,
copyPhotoVideoOnly = copyPhotoVideoOnly,
copyHidden = copyHidden
)
startCopyMoveNow()
} else {
copyMoveListener.copyFailed()
}
}
}
}

if (isCopyOperation) {
val recycleBinPath = fileDirItems.first().isRecycleBinPath(this)
if (canManageMedia() && !recycleBinPath) {
requestSdk30UpdateThenStart()
} else {
startCopyMove(
files = fileDirItems,
destinationPath = destination,
isCopyOperation = isCopyOperation,
copyPhotoVideoOnly = copyPhotoVideoOnly,
copyHidden = copyHidden
)
startCopyMoveNow()
}
} else {
if (isPathOnOTG(source) || isPathOnOTG(destination) || isPathOnSD(source) || isPathOnSD(
Expand All @@ -948,26 +975,9 @@ abstract class BaseSimpleActivity : EdgeToEdgeActivity() {
if (safSuccess) {
val recycleBinPath = fileDirItems.first().isRecycleBinPath(this)
if (canManageMedia() && !recycleBinPath) {
val fileUris = getFileUrisFromFileDirItems(fileDirItems)
updateSDK30Uris(fileUris) { sdk30UriSuccess ->
if (sdk30UriSuccess) {
startCopyMove(
files = fileDirItems,
destinationPath = destination,
isCopyOperation = isCopyOperation,
copyPhotoVideoOnly = copyPhotoVideoOnly,
copyHidden = copyHidden
)
}
}
requestSdk30UpdateThenStart()
} else {
startCopyMove(
files = fileDirItems,
destinationPath = destination,
isCopyOperation = isCopyOperation,
copyPhotoVideoOnly = copyPhotoVideoOnly,
copyHidden = copyHidden
)
startCopyMoveNow()
}
}
}
Expand Down
16 changes: 11 additions & 5 deletions commons/src/main/kotlin/org/fossify/commons/asynctasks/CopyMoveTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,11 +323,17 @@ class CopyMoveTask(
// if we delete multiple files from Downloads folder on Android 11 or 12 without being a Media Management app, show the confirmation dialog just once
private fun deleteProtectedFiles() {
if (mFileDirItemsToDelete.isNotEmpty()) {
val fileUris = activity.getFileUrisFromFileDirItems(mFileDirItemsToDelete)
activity.deleteSDK30Uris(fileUris) { success ->
if (success) {
mFileDirItemsToDelete.forEach {
activity.deleteFromMediaStore(it.path)
activity.resolveMediaStoreUris(mFileDirItemsToDelete) { resolution ->
val fileUris = resolution.uris
if (fileUris.isEmpty()) {
return@resolveMediaStoreUris
}

activity.deleteSDK30Uris(fileUris) { success ->
if (success) {
resolution.resolved.forEach {
activity.deleteFromMediaStore(it.fileDirItem.path)
}
}
}
}
Expand Down
Loading
Loading