fix to handle sms:12345678?body=hello%20there style intent data uri for compose activity start

This commit is contained in:
gavine99
2025-03-06 13:59:03 +11:00
parent 4cbf3bdc4d
commit 052f106683
@@ -42,31 +42,45 @@ class ComposeActivityModule {
@Provides @Provides
@Named("addresses") @Named("addresses")
fun provideAddresses(activity: ComposeActivity): List<String> { fun provideAddresses(activity: ComposeActivity): List<String> =
return activity.intent if ((activity.intent?.data?.scheme == "sms") || (activity.intent?.data?.scheme == "smsto"))
?.decodedDataString() activity.intent?.data
?.substringAfter(':') // Remove scheme ?.schemeSpecificPart
?.substringBefore("?") // Remove query ?.removeSuffix("?${activity.intent?.data?.query}")
?.split(",", ";") ?.split(",", ";")
?.filter { number -> number.isNotEmpty() } ?.filter { it.isNotEmpty() }
?: listOf() ?: listOf()
} else
listOf()
@Provides @Provides
@Named("text") @Named("text")
fun provideSharedText(activity: ComposeActivity): String { fun provideSharedText(activity: ComposeActivity): String {
var subject = activity.intent.getStringExtra(Intent.EXTRA_SUBJECT) ?: ""; var retVal = StringBuilder()
if (subject != "") {
subject += "\n"
}
return subject + (activity.intent.extras?.getString(Intent.EXTRA_TEXT) // from subject, if passed in intent
?: activity.intent.extras?.getString("sms_body") retVal.append(activity.intent?.getStringExtra(Intent.EXTRA_SUBJECT) ?: "")
?: activity.intent?.decodedDataString() if (retVal.isNotEmpty())
?.substringAfter('?') // Query string retVal.append("\n")
?.takeIf { it.startsWith("body") }
?.substringAfter('=') // from extra_text or sms_body extras, if passed in intent
retVal.append(
activity.intent?.extras?.getString(Intent.EXTRA_TEXT)
?: activity.intent?.extras?.getString("sms_body")
?: "") ?: "")
// from body param value(s) if intent data uri is like
// sms:12345678?body=hello%20there&body=goodbye
if ((activity.intent?.data?.scheme == "sms") || (activity.intent?.data?.scheme == "smsto"))
retVal.append(
activity.intent?.data?.query
?.split("&")
?.filter { it.startsWith("body=") }
?.joinToString("\n") { it.removePrefix("body=") }
?: ""
)
return retVal.toString()
} }
@Provides @Provides
@@ -105,13 +119,4 @@ class ComposeActivityModule {
@ViewModelKey(ComposeViewModel::class) @ViewModelKey(ComposeViewModel::class)
fun provideComposeViewModel(viewModel: ComposeViewModel): ViewModel = viewModel fun provideComposeViewModel(viewModel: ComposeViewModel): ViewModel = viewModel
// The dialer app on Oreo sends a URL encoded string, make sure to decode it
private fun Intent.decodedDataString(): String? {
val data = data?.toString()
if (data?.contains('%') == true) {
return URLDecoder.decode(data, "UTF-8")
}
return data
}
} }