Skip to content

Better handling of shared data #1807

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
ThomasSession merged 1 commit into from
Jan 5, 2026
Merged

Better handling of shared data #1807

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions app/src/main/java/org/thoughtcrime/securesms/ScreenLockActionBarActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ abstract class ScreenLockActionBarActivity : BaseActionBarActivity() {
// to rewrite the intent to reference a cached copy of the shared file.
// Note: We CANNOT just add `Intent.FLAG_GRANT_READ_URI_PERMISSION` to this intent as we
// pass it around because we don't have permission to do that (i.e., it doesn't work).
if (intent.action == "android.intent.action.SEND") {
if (intent.action == Intent.ACTION_SEND || intent.action == Intent.ACTION_SEND_MULTIPLE) {
val rewrittenIntent = rewriteShareIntentUris(intent)
return getRoutedIntent(ScreenLockActivity::class.java, rewrittenIntent)
} else {
Expand Down Expand Up @@ -225,7 +225,8 @@ abstract class ScreenLockActionBarActivity : BaseActionBarActivity() {
private suspend fun rewriteShareIntentUris(originalIntent: Intent): Intent? = withContext(Dispatchers.IO) {
val rewrittenIntent = Intent(originalIntent)

// Clear original clipData
// Clear original data
rewrittenIntent.data = null
rewrittenIntent.clipData = null
rewrittenIntent.removeExtra(Intent.EXTRA_STREAM)

Expand Down
31 changes: 21 additions & 10 deletions app/src/main/java/org/thoughtcrime/securesms/ShareViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,23 @@ class ShareViewModel @Inject constructor(
val type = intent.type
val incomingUris = ArrayList<Uri>()

if (Intent.ACTION_SEND == action) {
intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.let { incomingUris.add(it) }
} else if (Intent.ACTION_SEND_MULTIPLE == action) {
intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.let { incomingUris.addAll(it) }
val clipUris = intent.clipData?.let { cd ->
(0 until cd.itemCount).mapNotNull { cd.getItemAt(it).uri }
}.orEmpty()

if (clipUris.isNotEmpty()) {
incomingUris.addAll(clipUris)
} else {
if (Intent.ACTION_SEND == action) {
intent.getParcelableExtra<Uri>(Intent.EXTRA_STREAM)?.let(incomingUris::add)
} else if (Intent.ACTION_SEND_MULTIPLE == action) {
intent.getParcelableArrayListExtra<Uri>(Intent.EXTRA_STREAM)?.let(incomingUris::addAll)
}
intent.data?.let(incomingUris::add)
}

val uris = incomingUris.distinct()

var charSequenceExtra: CharSequence? = null
try {
charSequenceExtra = intent.getCharSequenceExtra(Intent.EXTRA_TEXT)
Expand All @@ -163,22 +174,22 @@ class ShareViewModel @Inject constructor(
}

isPassingAlongMedia = false
mimeType = getMimeType(incomingUris.firstOrNull(), type)
mimeType = getMimeType(uris.firstOrNull(), type)

if (incomingUris.isNotEmpty() && incomingUris.all { PartAuthority.isLocalUri(it) }) {
if (uris.isNotEmpty() && uris.all { PartAuthority.isLocalUri(it) }) {
isPassingAlongMedia = true
resolvedExtras = incomingUris
resolvedExtras = uris
handleResolvedMedia(intent)
} else if (
incomingUris.isEmpty() &&
uris.isEmpty() &&
charSequenceExtra != null &&
(mimeType?.startsWith("text/") == true)
) {
resolvedPlaintext = charSequenceExtra
handleResolvedMedia(intent)
} else if (incomingUris.isNotEmpty()) {
} else if (uris.isNotEmpty()) {
_uiState.update { it.copy(showLoader = true) }
resolveMedia(intent, incomingUris)
resolveMedia(intent, uris)
} else {
_uiState.update { it.copy(showLoader = false) }
}
Expand Down