filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix call screen stuck with some hanging up scenarios #4026

Browse Source
This commit is contained in:
ganfra 2021-09-16 12:04:18 +02:00
parent bd9a187597
commit 226b0e6c9d
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4026.bugfix Normal file
View File

@ -0,0 +1 @@
Fix call screen stuck with some hanging up scenarios

12
vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCall.kt
View File

@ -810,17 +810,19 @@ class WebRtcCall(
} }
} }
fun endCall(reason: EndCallReason = EndCallReason.USER_HANGUP) { fun endCall(reason: EndCallReason = EndCallReason.USER_HANGUP, sendSignaling: Boolean = true) {
sessionScope?.launch(dispatcher) { sessionScope?.launch(dispatcher) {
if (mxCall.state is CallState.Ended) { if (mxCall.state is CallState.Ended) {
return@launch return@launch
} }
val reject = mxCall.state is CallState.LocalRinging val reject = mxCall.state is CallState.LocalRinging
terminate(reason, reject) terminate(reason, reject)
if (reject) { if (sendSignaling) {
mxCall.reject() if (reject) {
} else { mxCall.reject()
mxCall.hangUp(reason) } else {
mxCall.hangUp(reason)
}
} }
} }
} }

6
vector/src/main/java/im/vector/app/features/call/webrtc/WebRtcCallManager.kt
View File

@ -424,7 +424,11 @@ class WebRtcCallManager @Inject constructor(
override fun onCallManagedByOtherSession(callId: String) { override fun onCallManagedByOtherSession(callId: String) {
Timber.tag(loggerTag.value).v("onCallManagedByOtherSession: $callId") Timber.tag(loggerTag.value).v("onCallManagedByOtherSession: $callId")
onCallEnded(callId, EndCallReason.ANSWERED_ELSEWHERE, false) val call = callsByCallId[callId]
?: return Unit.also {
Timber.tag(loggerTag.value).w("onCallManagedByOtherSession for non active call? $callId")
}
call.endCall(EndCallReason.ANSWERED_ELSEWHERE, sendSignaling = false)
} }
override fun onCallAssertedIdentityReceived(callAssertedIdentityContent: CallAssertedIdentityContent) { override fun onCallAssertedIdentityReceived(callAssertedIdentityContent: CallAssertedIdentityContent) {