Skip to content
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

select answer should be used for outgoing calls. #4625

Merged
merged 8 commits into from
Dec 3, 2021
+6 −2
Merged

select answer should be used for outgoing calls. #4625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f3b3c88
select answer should be used for outgoing calls.
langleyd Dec 2, 2021
a527e7a
Merge branch 'develop' of github.com:vector-im/element-android into f…
langleyd Dec 3, 2021
90f2e2c
Create 4621.bugfix
langleyd Dec 3, 2021
bf8b485
lint
langleyd Dec 3, 2021
0cf50e8
Keep guard pattern
langleyd Dec 3, 2021
de7180e
And remove braces
langleyd Dec 3, 2021
cd7345a
Removing trailing space
bmarty Dec 3, 2021
767ead0
Add warning if unexpected state.
langleyd Dec 3, 2021
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
1 change: 1 addition & 0 deletions changelog.d/4621.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix for outgoing voip call via sip bridge failing after 1 minute.
7 changes: 5 additions & 2 deletions ...dk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,11 @@ internal class MxCallImpl(

override fun selectAnswer() {
Timber.tag(loggerTag.value).v("select answer $callId")
if (isOutgoing) return
state = CallState.Answering
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we still set this state somewhere else or does CallState.Answering no longer need to exist?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It still exists and is set for incoming calls here as described in it's definition here.

This selectAnswer function is actually used for outgoing calls the current state at this point is Dialing and stays as that until the Connected state.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for explaining

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess the initial issue was due to a quick copy paste of the accept fun (https://github.com/vector-im/element-android/blob/main/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt#L179)

if (!isOutgoing) return
// This is an outgoing call, select the remote client that answered.
if (state != CallState.Dialing) {
Timber.tag(loggerTag.value).w("Expected state is CallState.Dialing got $state.")
}
CallSelectAnswerContent(
callId = callId,
partyId = ourPartyId,
Expand Down