Skip to content

fix(call): ignore stale roomJoined events that fire before joinRoomndCall #6045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tareko wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −1
Open

fix(call): ignore stale roomJoined events that fire before joinRoomndCall #6045

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ class CallActivity : CallBaseActivity() {
private var externalSignalingServer: ExternalSignalingServer? = null
private var webSocketClient: WebSocketInstance? = null
private var webSocketConnectionHelper: WebSocketConnectionHelper? = null
private var joinRoomInitiated = false
private var hasMCU = false
private var hasExternalSignalingServer = false
private var conversationPassword: String? = null
Expand Down Expand Up @@ -1521,6 +1522,7 @@ class CallActivity : CallBaseActivity() {
.toSet()

private fun joinRoomAndCall() {
joinRoomInitiated = true
callSession = ApplicationWideCurrentRoomHolder.getInstance().session
val apiVersion = ApiUtils.getConversationApiVersion(conversationUser, intArrayOf(ApiUtils.API_V4, 1))
Log.d(TAG, "joinRoomAndCall")
Expand Down Expand Up @@ -1874,7 +1876,11 @@ class CallActivity : CallBaseActivity() {
}

"roomJoined" -> {
Log.d(TAG, "onMessageEvent 'roomJoined'")
Log.d(TAG, "onMessageEvent 'roomJoined' joinRoomInitiated=$joinRoomInitiated")
if (!joinRoomInitiated) {
Log.d(TAG, "Ignoring stale roomJoined event (joinRoomAndCall not yet called)")
return
}
startSendingNick()
if (webSocketCommunicationEvent.getHashMap()!!["roomToken"] == roomToken) {
performCall()
Expand Down Expand Up @@ -1943,6 +1949,7 @@ class CallActivity : CallBaseActivity() {

private fun hangup(shutDownView: Boolean, endCallForAll: Boolean) {
Log.d(TAG, "hangup! shutDownView=$shutDownView")
joinRoomInitiated = false
if (shutDownView) {
setCallState(CallStatus.LEAVING)
}
Expand Down
Loading