Merge pull request #5785 from element-hq/fix/uris-take-precedence-in-share-intent

Uris should take precedence in plain text intents
This commit is contained in:
Benoit Marty 2025-11-26 10:53:31 +01:00 committed by GitHub
commit 2b1d36d57d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -58,8 +58,9 @@ class DefaultShareIntentHandler(
onPlainText: suspend (String) -> Boolean,
): Boolean {
val type = intent.resolveType(context) ?: return false
val uris = getIncomingUris(intent, type)
return when {
type == MimeTypes.PlainText -> handlePlainText(intent, onPlainText)
uris.isEmpty() && type == MimeTypes.PlainText -> handlePlainText(intent, onPlainText)
type.isMimeTypeImage() ||
type.isMimeTypeVideo() ||
type.isMimeTypeAudio() ||
@ -67,7 +68,6 @@ class DefaultShareIntentHandler(
type.isMimeTypeFile() ||
type.isMimeTypeText() ||
type.isMimeTypeAny() -> {
val uris = getIncomingUris(intent, type)
val result = onUris(uris)
revokeUriPermissions(uris.map { it.uri })
result