gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Store data channel label

Browse Source 
Getting the label is no longer possible once the data channel has been
disposed. This will help to make the observer thread-safe.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2024-12-09 03:11:54 +01:00 committed by Marcel Hibbe
parent fae86910b8
commit a301bdeb76
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -400,9 +400,11 @@ public class PeerConnectionWrapper {
private class DataChannelObserver implements DataChannel.Observer { private class DataChannelObserver implements DataChannel.Observer {
private final DataChannel dataChannel; private final DataChannel dataChannel;
private final String dataChannelLabel;
public DataChannelObserver(DataChannel dataChannel) { public DataChannelObserver(DataChannel dataChannel) {
this.dataChannel = Objects.requireNonNull(dataChannel); this.dataChannel = Objects.requireNonNull(dataChannel);
this.dataChannelLabel = dataChannel.label();
} }
@Override @Override
@ -412,7 +414,7 @@ public class PeerConnectionWrapper {
@Override @Override
public void onStateChange() { public void onStateChange() {
if (dataChannel.state() == DataChannel.State.OPEN && "status".equals(dataChannel.label())) { if (dataChannel.state() == DataChannel.State.OPEN && "status".equals(dataChannelLabel)) {
for (DataChannelMessage dataChannelMessage: pendingDataChannelMessages) { for (DataChannelMessage dataChannelMessage: pendingDataChannelMessages) {
send(dataChannelMessage); send(dataChannelMessage);
} }
@ -427,7 +429,7 @@ public class PeerConnectionWrapper {
@Override @Override
public void onMessage(DataChannel.Buffer buffer) { public void onMessage(DataChannel.Buffer buffer) {
if (buffer.binary) { if (buffer.binary) {
Log.d(TAG, "Received binary data channel message over " + dataChannel.label() + " " + sessionId); Log.d(TAG, "Received binary data channel message over " + dataChannelLabel + " " + sessionId);
return; return;
} }
@ -435,7 +437,7 @@ public class PeerConnectionWrapper {
final byte[] bytes = new byte[data.capacity()]; final byte[] bytes = new byte[data.capacity()];
data.get(bytes); data.get(bytes);
String strData = new String(bytes); String strData = new String(bytes);
Log.d(TAG, "Received data channel message (" + strData + ") over " + dataChannel.label() + " " + sessionId); Log.d(TAG, "Received data channel message (" + strData + ") over " + dataChannelLabel + " " + sessionId);
DataChannelMessage dataChannelMessage; DataChannelMessage dataChannelMessage;
try { try {