From d1a4265491d998b8371f48fb8b9e9b926b3e0b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Fri, 6 Dec 2024 14:00:57 +0100 Subject: [PATCH] Rename "sendChannelData" to "send" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The legacy name was a bit strange, so now it is renamed to just "send" as the parameter type ("DataChannelMessage") gives enough context. Signed-off-by: Daniel Calviño Sánchez --- .../java/com/nextcloud/talk/activities/CallActivity.kt | 10 +++++----- .../nextcloud/talk/webrtc/PeerConnectionWrapper.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt index 9220952c0..3bcc7611b 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt @@ -1174,12 +1174,12 @@ class CallActivity : CallBaseActivity() { if (isConnectionEstablished && othersInCall) { if (!hasMCU) { for (peerConnectionWrapper in peerConnectionWrapperList) { - peerConnectionWrapper.sendChannelData(DataChannelMessage(isSpeakingMessage)) + peerConnectionWrapper.send(DataChannelMessage(isSpeakingMessage)) } } else { for (peerConnectionWrapper in peerConnectionWrapperList) { if (peerConnectionWrapper.sessionId == webSocketClient!!.sessionId) { - peerConnectionWrapper.sendChannelData(DataChannelMessage(isSpeakingMessage)) + peerConnectionWrapper.send(DataChannelMessage(isSpeakingMessage)) break } } @@ -1370,12 +1370,12 @@ class CallActivity : CallBaseActivity() { if (isConnectionEstablished) { if (!hasMCU) { for (peerConnectionWrapper in peerConnectionWrapperList) { - peerConnectionWrapper.sendChannelData(DataChannelMessage(message)) + peerConnectionWrapper.send(DataChannelMessage(message)) } } else { for (peerConnectionWrapper in peerConnectionWrapperList) { if (peerConnectionWrapper.sessionId == webSocketClient!!.sessionId) { - peerConnectionWrapper.sendChannelData(DataChannelMessage(message)) + peerConnectionWrapper.send(DataChannelMessage(message)) break } } @@ -2563,7 +2563,7 @@ class CallActivity : CallBaseActivity() { } override fun onNext(aLong: Long) { - peerConnectionWrapper.sendChannelData(dataChannelMessage) + peerConnectionWrapper.send(dataChannelMessage) } override fun onError(e: Throwable) { diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java index 2d033d08e..bf95befb8 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java @@ -269,7 +269,7 @@ public class PeerConnectionWrapper { } } - public void sendChannelData(DataChannelMessage dataChannelMessage) { + public void send(DataChannelMessage dataChannelMessage) { ByteBuffer buffer; if (dataChannel != null && dataChannelMessage != null) { try { @@ -292,15 +292,15 @@ public class PeerConnectionWrapper { private void sendInitialMediaStatus() { if (localStream != null) { if (localStream.videoTracks.size() == 1 && localStream.videoTracks.get(0).enabled()) { - sendChannelData(new DataChannelMessage("videoOn")); + send(new DataChannelMessage("videoOn")); } else { - sendChannelData(new DataChannelMessage("videoOff")); + send(new DataChannelMessage("videoOff")); } if (localStream.audioTracks.size() == 1 && localStream.audioTracks.get(0).enabled()) { - sendChannelData(new DataChannelMessage("audioOn")); + send(new DataChannelMessage("audioOn")); } else { - sendChannelData(new DataChannelMessage("audioOff")); + send(new DataChannelMessage("audioOff")); } } }