Skip to content

fix(android): insert MediaStore rows as pending on Android 10 (Samsung) #155

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

Merged
iBotPeaches merged 1 commit into from
Oct 28, 2026
Merged

fix(android): insert MediaStore rows as pending on Android 10 (Samsung) #155

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 24 additions & 16 deletions android/src/main/java/com/rnfs2/RNFSMediaStoreManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ class RNFSMediaStoreManager {
}
}

fun createMediaFile(file: FileDescription, mediaType: MediaCollectionType): Uri {
fun createMediaFile(file: FileDescription, mediaType: MediaCollectionType): Uri =
insertMediaRow(file, mediaType, insertPending = false)

private fun insertMediaRow(
file: FileDescription,
mediaType: MediaCollectionType,
insertPending: Boolean
): Uri {
val resolver = context.contentResolver
val fileDetails =
ContentValues().apply {
Expand All @@ -78,6 +85,7 @@ class RNFSMediaStoreManager {
MediaStore.MediaColumns.RELATIVE_PATH,
getRelativePath(mediaType) + '/' + file.parentFolder
)
if (insertPending) put(MediaStore.MediaColumns.IS_PENDING, 1)
}
val mediaUri =
getMediaUri(mediaType)
Expand Down Expand Up @@ -168,26 +176,26 @@ class RNFSMediaStoreManager {
} catch (e: IOException) {
throw IORejectionException("ENOENT", "Source not accessible: $path")
}
val fileUri = createMediaFile(file, mediaType)
// Android 10 hides pending items from every caller, including the owner, unless the
// Uri opts in. Android 11+ always shows the owner its own pending items.
@Suppress("DEPRECATION")
val pendingUri =
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) MediaStore.setIncludePending(fileUri)
else fileUri
// Samsung's Android 10 MediaProvider makes a row inaccessible to its owner once a separate
// update flips it to pending (setIncludePending doesn't help), so on Q the row is inserted
// already pending.
val insertPending = Build.VERSION.SDK_INT == Build.VERSION_CODES.Q
val fileUri = insertMediaRow(file, mediaType, insertPending)

try {
val pendingValues = ContentValues().apply { put(MediaStore.MediaColumns.IS_PENDING, 1) }
if (resolver.update(pendingUri, pendingValues, null, null) == 0) {
throw IOException(
"Failed to mark media file as pending (0 rows updated)."
)
if (!insertPending) {
val pendingValues = ContentValues().apply { put(MediaStore.MediaColumns.IS_PENDING, 1) }
if (resolver.update(fileUri, pendingValues, null, null) == 0) {
throw IOException(
"Failed to mark media file as pending (0 rows updated)."
)
}
}
val writeSuccessful = writeToMediaFile(pendingUri, path, false)
val writeSuccessful = writeToMediaFile(fileUri, path, false)
if (writeSuccessful) {
val commitValues =
ContentValues().apply { put(MediaStore.MediaColumns.IS_PENDING, 0) }
if (resolver.update(pendingUri, commitValues, null, null) > 0) {
if (resolver.update(fileUri, commitValues, null, null) > 0) {
return fileUri
} else {
throw IOException(
Expand All @@ -198,7 +206,7 @@ class RNFSMediaStoreManager {
throw IOException("Failed to write file to MediaStore.")
}
} catch (e: Exception) {
cleanupMediaStoreEntry(pendingUri, resolver)
cleanupMediaStoreEntry(fileUri, resolver)
throw IOException("Unexpected error during copyToMediaStore: ${e.message}", e)
}
}
Expand Down
Loading