gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-08 23:19:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename magicDataChannel to dataChannel

Browse Source 
There is no 🧙 in a data channel.

Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2022-02-17 15:23:25 +01:00
parent 272ea7e846
commit 5580c15ea6
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
View File

@ -74,7 +74,7 @@ public class MagicPeerConnectionWrapper {
private String sessionId; private String sessionId;
private String nick; private String nick;
private final MediaConstraints mediaConstraints; private final MediaConstraints mediaConstraints;
private DataChannel magicDataChannel; private DataChannel dataChannel;
private final MagicSdpObserver magicSdpObserver; private final MagicSdpObserver magicSdpObserver;
private MediaStream remoteMediaStream; private MediaStream remoteMediaStream;
@ -126,8 +126,8 @@ public class MagicPeerConnectionWrapper {
if (hasMCU || hasInitiated) { if (hasMCU || hasInitiated) {
DataChannel.Init init = new DataChannel.Init(); DataChannel.Init init = new DataChannel.Init();
init.negotiated = false; init.negotiated = false;
magicDataChannel = peerConnection.createDataChannel("status", init); dataChannel = peerConnection.createDataChannel("status", init);
magicDataChannel.registerObserver(new MagicDataChannelObserver()); dataChannel.registerObserver(new MagicDataChannelObserver());
if (isMCUPublisher) { if (isMCUPublisher) {
peerConnection.createOffer(magicSdpObserver, mediaConstraints); peerConnection.createOffer(magicSdpObserver, mediaConstraints);
} else if (hasMCU && this.videoStreamType.equals("video")) { } else if (hasMCU && this.videoStreamType.equals("video")) {
@ -148,9 +148,9 @@ public class MagicPeerConnectionWrapper {
} }
public void removePeerConnection() { public void removePeerConnection() {
if (magicDataChannel != null) { if (dataChannel != null) {
magicDataChannel.dispose(); dataChannel.dispose();
magicDataChannel = null; dataChannel = null;
Log.d(TAG, "Disposed DataChannel"); Log.d(TAG, "Disposed DataChannel");
} else { } else {
Log.d(TAG, "DataChannel is null."); Log.d(TAG, "DataChannel is null.");
@ -190,10 +190,10 @@ public class MagicPeerConnectionWrapper {
public void sendNickChannelData(DataChannelMessageNick dataChannelMessage) { public void sendNickChannelData(DataChannelMessageNick dataChannelMessage) {
ByteBuffer buffer; ByteBuffer buffer;
if (magicDataChannel != null) { if (dataChannel != null) {
try { try {
buffer = ByteBuffer.wrap(LoganSquare.serialize(dataChannelMessage).getBytes()); buffer = ByteBuffer.wrap(LoganSquare.serialize(dataChannelMessage).getBytes());
magicDataChannel.send(new DataChannel.Buffer(buffer, false)); dataChannel.send(new DataChannel.Buffer(buffer, false));
} catch (IOException e) { } catch (IOException e) {
Log.d(TAG, "Failed to send channel data, attempting regular " + dataChannelMessage); Log.d(TAG, "Failed to send channel data, attempting regular " + dataChannelMessage);
} }
@ -202,10 +202,10 @@ public class MagicPeerConnectionWrapper {
public void sendChannelData(DataChannelMessage dataChannelMessage) { public void sendChannelData(DataChannelMessage dataChannelMessage) {
ByteBuffer buffer; ByteBuffer buffer;
if (magicDataChannel != null) { if (dataChannel != null) {
try { try {
buffer = ByteBuffer.wrap(LoganSquare.serialize(dataChannelMessage).getBytes()); buffer = ByteBuffer.wrap(LoganSquare.serialize(dataChannelMessage).getBytes());
magicDataChannel.send(new DataChannel.Buffer(buffer, false)); dataChannel.send(new DataChannel.Buffer(buffer, false));
} catch (IOException e) { } catch (IOException e) {
Log.d(TAG, "Failed to send channel data, attempting regular " + dataChannelMessage); Log.d(TAG, "Failed to send channel data, attempting regular " + dataChannelMessage);
} }
@ -265,8 +265,8 @@ public class MagicPeerConnectionWrapper {
@Override @Override
public void onStateChange() { public void onStateChange() {
if (magicDataChannel != null && magicDataChannel.state().equals(DataChannel.State.OPEN) && if (dataChannel != null && dataChannel.state().equals(DataChannel.State.OPEN) &&
magicDataChannel.label().equals("status")) { dataChannel.label().equals("status")) {
sendInitialMediaStatus(); sendInitialMediaStatus();
} }
} }
@ -397,8 +397,8 @@ public class MagicPeerConnectionWrapper {
@Override @Override
public void onDataChannel(DataChannel dataChannel) { public void onDataChannel(DataChannel dataChannel) {
if (dataChannel.label().equals("status") || dataChannel.label().equals("JanusDataChannel")) { if (dataChannel.label().equals("status") || dataChannel.label().equals("JanusDataChannel")) {
magicDataChannel = dataChannel; MagicPeerConnectionWrapper.this.dataChannel = dataChannel;
magicDataChannel.registerObserver(new MagicDataChannelObserver()); MagicPeerConnectionWrapper.this.dataChannel.registerObserver(new MagicDataChannelObserver());
} }
} }