Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Element call: Pass in custom call URL query parameters

Browse source
This commit is contained in:
Benoit Marty 2023-09-26 16:19:38 +02:00
parent f0d5c46eaa
commit 8cb7c3211c
2 changed files with 67 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

33
features/call/src/main/kotlin/io/element/android/features/call/CallIntentDataParser.kt
View file

@ -27,7 +27,7 @@ class CallIntentDataParser @Inject constructor() {
val parsedUrl = data?.let { Uri.parse(data) } ?: return null
val scheme = parsedUrl.scheme
return when {
scheme in validHttpSchemes && parsedUrl.host == "call.element.io" -> data
scheme in validHttpSchemes && parsedUrl.host == "call.element.io" -> parsedUrl
scheme == "element" && parsedUrl.host == "call" -> {
// We use this custom scheme to load arbitrary URLs for other instances of Element Call,
// so we can only verify it's an HTTP/HTTPs URL with a non-empty host
@ -40,14 +40,35 @@ class CallIntentDataParser @Inject constructor() {
}
// This should never be possible, but we still need to take into account the possibility
else -> null
}
}?.withCustomParameters()
}
private fun Uri.getUrlParameter(): String? {
private fun Uri.getUrlParameter(): Uri? {
return getQueryParameter("url")
?.takeIf {
val internalUri = Uri.parse(it)
internalUri.scheme in validHttpSchemes && !internalUri.host.isNullOrBlank()
?.let { urlParameter ->
Uri.parse(urlParameter).takeIf { uri ->
uri.scheme in validHttpSchemes && !uri.host.isNullOrBlank()
}
}
}
}
/**
* Ensure the uri has the following parameters and value:
* - appPrompt=false
* - confineToRoom=true
*/
private fun Uri.withCustomParameters(): String {
val builder = buildUpon()
builder.clearQuery()
queryParameterNames.forEach {
if (it == APP_PROMPT_PARAMETER || it == CONFINE_TO_ROOM_PARAMETER) return@forEach
builder.appendQueryParameter(it, getQueryParameter(it))
}
builder.appendQueryParameter(APP_PROMPT_PARAMETER, "false")
builder.appendQueryParameter(CONFINE_TO_ROOM_PARAMETER, "true")
return builder.build().toString()
}
private const val APP_PROMPT_PARAMETER = "appPrompt"
private const val CONFINE_TO_ROOM_PARAMETER = "confineToRoom"