acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Reading the optional String extras from attachment share intents (#9396)

Browse Source 
and adding them to the compose intents for images and videos if they exist.

Co-authored-by: Tom Quinders <tom.quinders@check24.de>
This commit is contained in:
tomsqrd
2025-11-22 12:03:30 +01:00
committed by GitHub
parent af13c70444
commit 9136be68b3
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt
+27 -8
View File
@@ -78,10 +78,12 @@ class ExpoReceiveAndroidIntentsModule : Module() {
intent.getParcelableExtra(Intent.EXTRA_STREAM) intent.getParcelableExtra(Intent.EXTRA_STREAM)
} }
val text = intent.getStringExtra(Intent.EXTRA_TEXT)
uri?.let { uri?.let {
when (type) { when (type) {
AttachmentType.IMAGE -> handleImageIntents(listOf(it)) AttachmentType.IMAGE -> handleImageIntents(listOf(it), text)
AttachmentType.VIDEO -> handleVideoIntents(listOf(it)) AttachmentType.VIDEO -> handleVideoIntents(listOf(it), text)
} }
} }
} }
@@ -103,15 +105,20 @@ class ExpoReceiveAndroidIntentsModule : Module() {
?.take(4) ?.take(4)
} }
val text = intent.getStringExtra(Intent.EXTRA_TEXT)
uris?.let { uris?.let {
when (type) { when (type) {
AttachmentType.IMAGE -> handleImageIntents(it) AttachmentType.IMAGE -> handleImageIntents(it, text)
else -> return else -> return
} }
} }
} }
private fun handleImageIntents(uris: List<Uri>) { private fun handleImageIntents(
uris: List<Uri>,
text: String?
) {
var allParams = "" var allParams = ""
uris.forEachIndexed { index, uri -> uris.forEachIndexed { index, uri ->
@@ -124,15 +131,22 @@ class ExpoReceiveAndroidIntentsModule : Module() {
} }
} }
val encoded = URLEncoder.encode(allParams, "UTF-8") val encodedUris = URLEncoder.encode(allParams, "UTF-8")
val encodedText = text?.let { URLEncoder.encode(it, "UTF-8") }
"bluesky://intent/compose?imageUris=$encoded".toUri().let { var composeIntent = "bluesky://intent/compose?imageUris=$encodedUris"
encodedText?.let { composeIntent += "&text=$it" }
composeIntent.toUri().let {
val newIntent = Intent(Intent.ACTION_VIEW, it) val newIntent = Intent(Intent.ACTION_VIEW, it)
appContext.currentActivity?.startActivity(newIntent) appContext.currentActivity?.startActivity(newIntent)
} }
} }
private fun handleVideoIntents(uris: List<Uri>) { private fun handleVideoIntents(
uris: List<Uri>,
text: String?
) {
val uri = uris[0] val uri = uris[0]
// If there is no extension for the file, substringAfterLast returns the original string - not // If there is no extension for the file, substringAfterLast returns the original string - not
// null, so we check for that below // null, so we check for that below
@@ -151,7 +165,12 @@ class ExpoReceiveAndroidIntentsModule : Module() {
val info = getVideoInfo(uri) ?: return val info = getVideoInfo(uri) ?: return
"bluesky://intent/compose?videoUri=${URLEncoder.encode(file.path, "UTF-8")}|${info["width"]}|${info["height"]}".toUri().let { val encodedText = text?.let { URLEncoder.encode(it, "UTF-8") }
var composeIntent = "bluesky://intent/compose?videoUri=${URLEncoder.encode(file.path, "UTF-8")}|${info["width"]}|${info["height"]}"
encodedText?.let { composeIntent += "&text=$it" }
composeIntent.toUri().let {
val newIntent = Intent(Intent.ACTION_VIEW, it) val newIntent = Intent(Intent.ACTION_VIEW, it)
appContext.currentActivity?.startActivity(newIntent) appContext.currentActivity?.startActivity(newIntent)
} }