letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 00083ede4c e088129f2d
commit 3b4e43b681
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
features/share/impl/src/main/kotlin/io/element/android/features/share/impl/ShareIntentHandler.kt
View File

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