Parse body param in uri query

Fixes 1321
This commit is contained in:
Moez Bhatti
2019-11-24 11:48:53 -05:00
parent 13a418be45
commit 65fd1cacdb
@@ -44,23 +44,12 @@ class ComposeActivityModule {
@Provides @Provides
@Named("addresses") @Named("addresses")
fun provideAddresses(activity: ComposeActivity): List<String> { fun provideAddresses(activity: ComposeActivity): List<String> {
activity.intent.data?.let { return activity.intent
val data = it.toString() ?.decodedDataString()
var address = when { ?.substringAfter(':') // Remove scheme
it.scheme?.startsWith("smsto") == true -> data.replace("smsto:", "") ?.replaceAfter("?", "") // Remove query
it.scheme?.startsWith("mmsto") == true -> data.replace("mmsto:", "") ?.split(",")
it.scheme?.startsWith("sms") == true -> data.replace("sms:", "") ?: listOf()
it.scheme?.startsWith("mms") == true -> data.replace("mms:", "")
else -> ""
}
// The dialer app on Oreo sends a URL encoded string, make sure to decode it
if (address.contains('%')) address = URLDecoder.decode(address, "UTF-8")
return address.split(",")
}
return listOf()
} }
@Provides @Provides
@@ -68,6 +57,11 @@ class ComposeActivityModule {
fun provideSharedText(activity: ComposeActivity): String { fun provideSharedText(activity: ComposeActivity): String {
return activity.intent.extras?.getString(Intent.EXTRA_TEXT) return activity.intent.extras?.getString(Intent.EXTRA_TEXT)
?: activity.intent.extras?.getString("sms_body") ?: activity.intent.extras?.getString("sms_body")
?: activity.intent?.decodedDataString()
?.substringAfter('?') // Query string
?.split(',')
?.firstOrNull { param -> param.startsWith("body") }
?.substringAfter('=')
?: "" ?: ""
} }
@@ -85,4 +79,13 @@ 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
}
} }