gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-07 06:39:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Include data channel label in log message

Browse Source 
This implicitly fixes trying to send the initial state on the latest
remote data channel found (which is the one stored in the "dataChannel"
attribute of the "PeerConnectionWrapper") when any other existing data
channel changes its status to open. Nevertheless, as all this will be
reworked, no unit test was added for it.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2024-12-05 14:55:57 +01:00 committed by Marcel Hibbe
parent 4daadc508c
commit 1f872553b9
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
View File

@ -36,6 +36,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import androidx.annotation.Nullable;
@ -144,7 +145,7 @@ public class PeerConnectionWrapper {
DataChannel.Init init = new DataChannel.Init();
init.negotiated = false;
dataChannel = peerConnection.createDataChannel("status", init);
dataChannel.registerObserver(new DataChannelObserver());
dataChannel.registerObserver(new DataChannelObserver(dataChannel));
if (isMCUPublisher) {
peerConnection.createOffer(sdpObserver, mediaConstraints);
} else if (hasMCU && "video".equals(this.videoStreamType)) {
@ -363,6 +364,12 @@ public class PeerConnectionWrapper {
private class DataChannelObserver implements DataChannel.Observer {
private final DataChannel dataChannel;
public DataChannelObserver(DataChannel dataChannel) {
this.dataChannel = Objects.requireNonNull(dataChannel);
}
@Override
public void onBufferedAmountChange(long l) {
@ -370,8 +377,7 @@ public class PeerConnectionWrapper {
@Override
public void onStateChange() {
if (dataChannel != null &&
dataChannel.state() == DataChannel.State.OPEN) {
if (dataChannel.state() == DataChannel.State.OPEN) {
sendInitialMediaStatus();
}
}
@ -379,7 +385,7 @@ public class PeerConnectionWrapper {
@Override
public void onMessage(DataChannel.Buffer buffer) {
if (buffer.binary) {
Log.d(TAG, "Received binary data channel message over " + TAG + " " + sessionId);
Log.d(TAG, "Received binary data channel message over " + dataChannel.label() + " " + sessionId);
return;
}
@ -387,7 +393,7 @@ public class PeerConnectionWrapper {
final byte[] bytes = new byte[data.capacity()];
data.get(bytes);
String strData = new String(bytes);
Log.d(TAG, "Received data channel message (" + strData + ") over " + TAG + " " + sessionId);
Log.d(TAG, "Received data channel message (" + strData + ") over " + dataChannel.label() + " " + sessionId);
DataChannelMessage dataChannelMessage;
try {
@ -512,7 +518,7 @@ public class PeerConnectionWrapper {
+ " exists, but received onDataChannel event for DataChannel with label " + dataChannel.label());
}
PeerConnectionWrapper.this.dataChannel = dataChannel;
PeerConnectionWrapper.this.dataChannel.registerObserver(new DataChannelObserver());
PeerConnectionWrapper.this.dataChannel.registerObserver(new DataChannelObserver(dataChannel));
}
@Override