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

Merge pull request #4297 from robintown/ec-close

Browse source 
Show error screens in group calls
This commit is contained in:
Benoit Marty 2025-03-06 16:22:24 +01:00 • committed by GitHub
commit fc4130310c
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/data/WidgetMessage.kt
View file

@ -33,6 +33,9 @@ data class WidgetMessage(
@SerialName("im.vector.hangup") @SerialName("im.vector.hangup")
HangUp, HangUp,
@SerialName("io.element.close")
Close,
@SerialName("send_event") @SerialName("send_event")
SendEvent, SendEvent,
} }

2
features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenPresenter.kt
View file

@ -135,7 +135,7 @@ class CallScreenPresenter @AssistedInject constructor(
val parsedMessage = parseMessage(it) val parsedMessage = parseMessage(it)
if (parsedMessage?.direction == WidgetMessage.Direction.FromWidget) { if (parsedMessage?.direction == WidgetMessage.Direction.FromWidget) {
if (parsedMessage.action == WidgetMessage.Action.HangUp) { if (parsedMessage.action == WidgetMessage.Action.Close) {
close(callWidgetDriver.value, navigator) close(callWidgetDriver.value, navigator)
} else if (parsedMessage.action == WidgetMessage.Action.SendEvent) { } else if (parsedMessage.action == WidgetMessage.Action.SendEvent) {
// This event is received when a member joins the call, the first one will be the current one // This event is received when a member joins the call, the first one will be the current one

4
features/call/impl/src/test/kotlin/io/element/android/features/call/ui/CallScreenPresenterTest.kt
View file

@ -174,7 +174,7 @@ class CallScreenPresenterTest {
@OptIn(ExperimentalCoroutinesApi::class) @OptIn(ExperimentalCoroutinesApi::class)
@Test @Test
fun `present - a received hang up message closes the screen and stops the widget driver`() = runTest(UnconfinedTestDispatcher()) { fun `present - a received close message closes the screen and stops the widget driver`() = runTest(UnconfinedTestDispatcher()) {
val navigator = FakeCallScreenNavigator() val navigator = FakeCallScreenNavigator()
val widgetDriver = FakeMatrixWidgetDriver() val widgetDriver = FakeMatrixWidgetDriver()
val presenter = createCallScreenPresenter( val presenter = createCallScreenPresenter(
@ -191,7 +191,7 @@ class CallScreenPresenterTest {
val initialState = awaitItem() val initialState = awaitItem()
initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor)) initialState.eventSink(CallScreenEvents.SetupMessageChannels(messageInterceptor))
messageInterceptor.givenInterceptedMessage("""{"action":"im.vector.hangup","api":"fromWidget","widgetId":"1","requestId":"1"}""") messageInterceptor.givenInterceptedMessage("""{"action":"io.element.close","api":"fromWidget","widgetId":"1","requestId":"1"}""")
// Let background coroutines run // Let background coroutines run
runCurrent() runCurrent()