davidliu
Committed by GitHub

Stop leave request from being queued up (#243)

@@ -549,10 +549,12 @@ constructor( @@ -549,10 +549,12 @@ constructor(
549 val sd = fromProtoSessionDescription(response.answer) 549 val sd = fromProtoSessionDescription(response.answer)
550 listener?.onAnswer(sd) 550 listener?.onAnswer(sd)
551 } 551 }
  552 +
552 LivekitRtc.SignalResponse.MessageCase.OFFER -> { 553 LivekitRtc.SignalResponse.MessageCase.OFFER -> {
553 val sd = fromProtoSessionDescription(response.offer) 554 val sd = fromProtoSessionDescription(response.offer)
554 listener?.onOffer(sd) 555 listener?.onOffer(sd)
555 } 556 }
  557 +
556 LivekitRtc.SignalResponse.MessageCase.TRICKLE -> { 558 LivekitRtc.SignalResponse.MessageCase.TRICKLE -> {
557 val iceCandidateJson = 559 val iceCandidateJson =
558 json.decodeFromString<IceCandidateJSON>(response.trickle.candidateInit) 560 json.decodeFromString<IceCandidateJSON>(response.trickle.candidateInit)
@@ -563,33 +565,43 @@ constructor( @@ -563,33 +565,43 @@ constructor(
563 ) 565 )
564 listener?.onTrickle(iceCandidate, response.trickle.target) 566 listener?.onTrickle(iceCandidate, response.trickle.target)
565 } 567 }
  568 +
566 LivekitRtc.SignalResponse.MessageCase.UPDATE -> { 569 LivekitRtc.SignalResponse.MessageCase.UPDATE -> {
567 listener?.onParticipantUpdate(response.update.participantsList) 570 listener?.onParticipantUpdate(response.update.participantsList)
568 } 571 }
  572 +
569 LivekitRtc.SignalResponse.MessageCase.TRACK_PUBLISHED -> { 573 LivekitRtc.SignalResponse.MessageCase.TRACK_PUBLISHED -> {
570 listener?.onLocalTrackPublished(response.trackPublished) 574 listener?.onLocalTrackPublished(response.trackPublished)
571 } 575 }
  576 +
572 LivekitRtc.SignalResponse.MessageCase.SPEAKERS_CHANGED -> { 577 LivekitRtc.SignalResponse.MessageCase.SPEAKERS_CHANGED -> {
573 listener?.onSpeakersChanged(response.speakersChanged.speakersList) 578 listener?.onSpeakersChanged(response.speakersChanged.speakersList)
574 } 579 }
  580 +
575 LivekitRtc.SignalResponse.MessageCase.JOIN -> { 581 LivekitRtc.SignalResponse.MessageCase.JOIN -> {
576 LKLog.d { "received unexpected extra join message?" } 582 LKLog.d { "received unexpected extra join message?" }
577 } 583 }
  584 +
578 LivekitRtc.SignalResponse.MessageCase.LEAVE -> { 585 LivekitRtc.SignalResponse.MessageCase.LEAVE -> {
579 listener?.onLeave(response.leave) 586 listener?.onLeave(response.leave)
580 } 587 }
  588 +
581 LivekitRtc.SignalResponse.MessageCase.MUTE -> { 589 LivekitRtc.SignalResponse.MessageCase.MUTE -> {
582 listener?.onRemoteMuteChanged(response.mute.sid, response.mute.muted) 590 listener?.onRemoteMuteChanged(response.mute.sid, response.mute.muted)
583 } 591 }
  592 +
584 LivekitRtc.SignalResponse.MessageCase.ROOM_UPDATE -> { 593 LivekitRtc.SignalResponse.MessageCase.ROOM_UPDATE -> {
585 listener?.onRoomUpdate(response.roomUpdate.room) 594 listener?.onRoomUpdate(response.roomUpdate.room)
586 } 595 }
  596 +
587 LivekitRtc.SignalResponse.MessageCase.CONNECTION_QUALITY -> { 597 LivekitRtc.SignalResponse.MessageCase.CONNECTION_QUALITY -> {
588 listener?.onConnectionQuality(response.connectionQuality.updatesList) 598 listener?.onConnectionQuality(response.connectionQuality.updatesList)
589 } 599 }
  600 +
590 LivekitRtc.SignalResponse.MessageCase.STREAM_STATE_UPDATE -> { 601 LivekitRtc.SignalResponse.MessageCase.STREAM_STATE_UPDATE -> {
591 listener?.onStreamStateUpdate(response.streamStateUpdate.streamStatesList) 602 listener?.onStreamStateUpdate(response.streamStateUpdate.streamStatesList)
592 } 603 }
  604 +
593 LivekitRtc.SignalResponse.MessageCase.SUBSCRIBED_QUALITY_UPDATE -> { 605 LivekitRtc.SignalResponse.MessageCase.SUBSCRIBED_QUALITY_UPDATE -> {
594 val versionToIgnoreUpTo = Semver("0.15.1") 606 val versionToIgnoreUpTo = Semver("0.15.1")
595 if ((serverVersion?.compareTo(versionToIgnoreUpTo) ?: 1) <= 0) { 607 if ((serverVersion?.compareTo(versionToIgnoreUpTo) ?: 1) <= 0) {
@@ -597,24 +609,31 @@ constructor( @@ -597,24 +609,31 @@ constructor(
597 } 609 }
598 listener?.onSubscribedQualityUpdate(response.subscribedQualityUpdate) 610 listener?.onSubscribedQualityUpdate(response.subscribedQualityUpdate)
599 } 611 }
  612 +
600 LivekitRtc.SignalResponse.MessageCase.SUBSCRIPTION_PERMISSION_UPDATE -> { 613 LivekitRtc.SignalResponse.MessageCase.SUBSCRIPTION_PERMISSION_UPDATE -> {
601 listener?.onSubscriptionPermissionUpdate(response.subscriptionPermissionUpdate) 614 listener?.onSubscriptionPermissionUpdate(response.subscriptionPermissionUpdate)
602 } 615 }
  616 +
603 LivekitRtc.SignalResponse.MessageCase.REFRESH_TOKEN -> { 617 LivekitRtc.SignalResponse.MessageCase.REFRESH_TOKEN -> {
604 listener?.onRefreshToken(response.refreshToken) 618 listener?.onRefreshToken(response.refreshToken)
605 } 619 }
  620 +
606 LivekitRtc.SignalResponse.MessageCase.TRACK_UNPUBLISHED -> { 621 LivekitRtc.SignalResponse.MessageCase.TRACK_UNPUBLISHED -> {
607 listener?.onLocalTrackUnpublished(response.trackUnpublished) 622 listener?.onLocalTrackUnpublished(response.trackUnpublished)
608 } 623 }
  624 +
609 LivekitRtc.SignalResponse.MessageCase.PONG -> { 625 LivekitRtc.SignalResponse.MessageCase.PONG -> {
610 resetPingTimeout() 626 resetPingTimeout()
611 } 627 }
  628 +
612 LivekitRtc.SignalResponse.MessageCase.PONG_RESP -> { 629 LivekitRtc.SignalResponse.MessageCase.PONG_RESP -> {
613 // TODO 630 // TODO
614 } 631 }
  632 +
615 LivekitRtc.SignalResponse.MessageCase.RECONNECT -> { 633 LivekitRtc.SignalResponse.MessageCase.RECONNECT -> {
616 // TODO 634 // TODO
617 } 635 }
  636 +
618 LivekitRtc.SignalResponse.MessageCase.MESSAGE_NOT_SET, 637 LivekitRtc.SignalResponse.MessageCase.MESSAGE_NOT_SET,
619 null -> { 638 null -> {
620 LKLog.v { "empty messageCase!" } 639 LKLog.v { "empty messageCase!" }
@@ -730,7 +749,8 @@ constructor( @@ -730,7 +749,8 @@ constructor(
730 LivekitRtc.SignalRequest.MessageCase.TRICKLE, 749 LivekitRtc.SignalRequest.MessageCase.TRICKLE,
731 LivekitRtc.SignalRequest.MessageCase.OFFER, 750 LivekitRtc.SignalRequest.MessageCase.OFFER,
732 LivekitRtc.SignalRequest.MessageCase.ANSWER, 751 LivekitRtc.SignalRequest.MessageCase.ANSWER,
733 - LivekitRtc.SignalRequest.MessageCase.SIMULATE 752 + LivekitRtc.SignalRequest.MessageCase.SIMULATE,
  753 + LivekitRtc.SignalRequest.MessageCase.LEAVE,
734 ) 754 )
735 755
736 private fun iceServer(url: String) = 756 private fun iceServer(url: String) =