Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add proper timeout for call state changes.

Browse Source
This commit is contained in:
Alex Hart
2025-02-19 10:20:51 -04:00
committed by Greyson Parrelli
parent 6ebf9231d8
commit 4474d1fc9e
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallScreen.kt
View File

@@ -384,7 +384,6 @@ private fun LargeLocalVideoRenderer(
localParticipant = localParticipant,
modifier = Modifier
.fillMaxSize()
.clip(MaterialTheme.shapes.extraLarge)
)
}

19
app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/ComposeCallScreenMediator.kt
View File

@@ -15,6 +15,9 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancelAndJoin
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.collectLatest
@@ -32,6 +35,7 @@ import org.thoughtcrime.securesms.events.WebRtcViewModel
import org.thoughtcrime.securesms.recipients.Recipient
import org.thoughtcrime.securesms.service.webrtc.state.WebRtcEphemeralState
import org.thoughtcrime.securesms.webrtc.CallParticipantsViewState
import kotlin.time.Duration.Companion.seconds
/**
* Compose call screen wrapper
@@ -254,7 +258,7 @@ class ComposeCallScreenMediator(activity: WebRtcCallActivity, viewModel: WebRtcC
}
override fun onCallStateUpdate(callControlsChange: CallControlsChange) {
callScreenViewModel.callScreenState.update { it.copy(callControlsChange = callControlsChange) }
callScreenViewModel.emitCallControlsChange(callControlsChange)
}
override fun dismissCallOverflowPopup() {
@@ -298,10 +302,23 @@ class ComposeCallScreenMediator(activity: WebRtcCallActivity, viewModel: WebRtcC
)
)
private var callControlsChangeJob: Job? = null
val callParticipantListUpdate = MutableStateFlow(CallParticipantListUpdate.computeDeltaUpdate(emptyList(), emptyList()))
fun emitControllerEvent(controllerEvent: CallScreenController.Event) {
viewModelScope.launch { callScreenControllerEvents.emit(controllerEvent) }
}
fun emitCallControlsChange(callControlsChange: CallControlsChange) {
viewModelScope.launch {
callControlsChangeJob?.cancelAndJoin()
callControlsChangeJob = launch {
callScreenState.update { it.copy(callControlsChange = callControlsChange) }
delay(2.seconds)
callScreenState.update { it.copy(callControlsChange = null) }
}
}
}
}
}