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

Rename "sendChannelData" to "send"

Browse Source 
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 <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2024-12-06 14:00:57 +01:00 committed by Marcel Hibbe
parent 1f872553b9
commit a4cce0581c
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/activities/CallActivity.kt
View File

@ -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) {

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

@ -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"));
}
}
}