mirror of
https://github.com/Novaloop-AG/element-x-android.git
synced 2026-11-05 22:36:34 +00:00
Merge pull request #6114 from element-hq/feature/bma/elementCallKnownHost
Ensure that Element Call activity is not closed when using an external link
This commit is contained in:
+3
@@ -149,6 +149,8 @@ class CallScreenPresenter(
|
|||||||
.launchIn(this)
|
.launchIn(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (callType is CallType.RoomCall) {
|
||||||
|
// Note: For external calls isWidgetLoaded will always be false
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
// Wait for the call to be joined, if it takes too long, we display an error
|
// Wait for the call to be joined, if it takes too long, we display an error
|
||||||
delay(10.seconds)
|
delay(10.seconds)
|
||||||
@@ -161,6 +163,7 @@ class CallScreenPresenter(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun handleEvent(event: CallScreenEvents) {
|
fun handleEvent(event: CallScreenEvents) {
|
||||||
when (event) {
|
when (event) {
|
||||||
|
|||||||
+1
@@ -17,6 +17,7 @@ class CallIntentDataParser {
|
|||||||
private val validHttpSchemes = sequenceOf("https")
|
private val validHttpSchemes = sequenceOf("https")
|
||||||
private val knownHosts = sequenceOf(
|
private val knownHosts = sequenceOf(
|
||||||
"call.element.io",
|
"call.element.io",
|
||||||
|
"call.pro.element.io",
|
||||||
)
|
)
|
||||||
|
|
||||||
fun parse(data: String?): String? {
|
fun parse(data: String?): String? {
|
||||||
|
|||||||
Reference in New Issue
Block a user