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

Replace wrapper with actual message in external signaling server

Browse Source 
NCMessageWrapper is used only for messages sent and received by the
internal signaling server. However, it is unused by the external
signaling server, except for getting the NCSignalingMessage, which is
the common message for both signaling servers.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
This commit is contained in:
Daniel Calviño Sánchez 2022-10-24 10:07:53 +02:00 committed by Marcel Hibbe
parent 3dac8fb9ce
commit e1eca7764f
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2304,7 +2304,7 @@ public class CallActivity extends CallBaseActivity {
}
});
} else {
webSocketClient.sendCallMessage(ncMessageWrapper);
webSocketClient.sendCallMessage(ncSignalingMessage);
}
}

5
app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
View File

@ -31,7 +31,6 @@ import com.nextcloud.talk.data.user.model.User;
import com.nextcloud.talk.events.NetworkEvent;
import com.nextcloud.talk.events.WebSocketCommunicationEvent;
import com.nextcloud.talk.models.json.participants.Participant;
import com.nextcloud.talk.models.json.signaling.NCMessageWrapper;
import com.nextcloud.talk.models.json.signaling.NCSignalingMessage;
import com.nextcloud.talk.models.json.websocket.BaseWebSocketMessage;
import com.nextcloud.talk.models.json.websocket.ByeWebSocketMessage;
@ -344,9 +343,9 @@ public class MagicWebSocketInstance extends WebSocketListener {
}
}
public void sendCallMessage(NCMessageWrapper ncMessageWrapper) {
public void sendCallMessage(NCSignalingMessage ncSignalingMessage) {
try {
String message = LoganSquare.serialize(webSocketConnectionHelper.getAssembledCallMessageModel(ncMessageWrapper));
String message = LoganSquare.serialize(webSocketConnectionHelper.getAssembledCallMessageModel(ncSignalingMessage));
if (!connected || reconnecting) {
messagesQueue.add(message);
} else {

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

@ -25,7 +25,7 @@ import android.util.Log;
import com.nextcloud.talk.application.NextcloudTalkApplication;
import com.nextcloud.talk.data.user.model.User;
import com.nextcloud.talk.models.json.signaling.NCMessageWrapper;
import com.nextcloud.talk.models.json.signaling.NCSignalingMessage;
import com.nextcloud.talk.models.json.websocket.ActorWebSocketMessage;
import com.nextcloud.talk.models.json.websocket.AuthParametersWebSocketMessage;
import com.nextcloud.talk.models.json.websocket.AuthWebSocketMessage;
@ -166,7 +166,7 @@ public class WebSocketConnectionHelper {
return requestOfferOverallWebSocketMessage;
}
CallOverallWebSocketMessage getAssembledCallMessageModel(NCMessageWrapper ncMessageWrapper) {
CallOverallWebSocketMessage getAssembledCallMessageModel(NCSignalingMessage ncSignalingMessage) {
CallOverallWebSocketMessage callOverallWebSocketMessage = new CallOverallWebSocketMessage();
callOverallWebSocketMessage.setType("message");
@ -174,9 +174,9 @@ public class WebSocketConnectionHelper {
ActorWebSocketMessage actorWebSocketMessage = new ActorWebSocketMessage();
actorWebSocketMessage.setType("session");
actorWebSocketMessage.setSessionId(ncMessageWrapper.getSignalingMessage().getTo());
actorWebSocketMessage.setSessionId(ncSignalingMessage.getTo());
callWebSocketMessage.setRecipientWebSocketMessage(actorWebSocketMessage);
callWebSocketMessage.setNcSignalingMessage(ncMessageWrapper.getSignalingMessage());
callWebSocketMessage.setNcSignalingMessage(ncSignalingMessage);
callOverallWebSocketMessage.setCallWebSocketMessage(callWebSocketMessage);
return callOverallWebSocketMessage;