Skip to content

[stable-18.1] add compatibility for janus 1.x #3705

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

Merged
merged 1 commit into from
Mar 12, 2024
Merged

[stable-18.1] add compatibility for janus 1.x #3705

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
11 changes: 6 additions & 5 deletions app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,8 +398,7 @@ public void onBufferedAmountChange(long l) {
@Override
public void onStateChange() {
if (dataChannel != null &&
dataChannel.state() == DataChannel.State.OPEN &&
"status".equals(dataChannel.label())) {
dataChannel.state() == DataChannel.State.OPEN) {
sendInitialMediaStatus();
}
}
Expand Down Expand Up @@ -535,10 +534,12 @@ public void onRemoveStream(MediaStream mediaStream) {

@Override
public void onDataChannel(DataChannel dataChannel) {
if ("status".equals(dataChannel.label()) || "JanusDataChannel".equals(dataChannel.label())) {
PeerConnectionWrapper.this.dataChannel = dataChannel;
PeerConnectionWrapper.this.dataChannel.registerObserver(new MagicDataChannelObserver());
if (PeerConnectionWrapper.this.dataChannel != null) {
Log.w(TAG, "Data channel with label " + PeerConnectionWrapper.this.dataChannel.label()
+ " exists, but received onDataChannel event for DataChannel with label " + dataChannel.label());
}
PeerConnectionWrapper.this.dataChannel = dataChannel;
PeerConnectionWrapper.this.dataChannel.registerObserver(new MagicDataChannelObserver());
}

@Override
Expand Down