From b4d4cdf2191757b57edd23d338c2d5c3b471deb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Mon, 24 Oct 2022 11:01:03 +0200 Subject: [PATCH] Remove unused wrapper in the internal signaling server MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Messages sent to the internal signaling server need to be serialized twice, first the signaling message and then the wrapper as a whole. Due to this the NCMessageWrapper was not actually used. For simplicity the manual serialization was kept rather than adding something like "NCMessageWrapperToSend" where a serialized signaling message could be set before serializing it. Signed-off-by: Daniel Calviño Sánchez --- .../com/nextcloud/talk/activities/CallActivity.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index 5d19f9960..e99e65a93 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -79,7 +79,6 @@ import com.nextcloud.talk.models.json.participants.ParticipantsOverall; import com.nextcloud.talk.models.json.signaling.DataChannelMessage; import com.nextcloud.talk.models.json.signaling.DataChannelMessageNick; import com.nextcloud.talk.models.json.signaling.NCMessagePayload; -import com.nextcloud.talk.models.json.signaling.NCMessageWrapper; import com.nextcloud.talk.models.json.signaling.NCSignalingMessage; import com.nextcloud.talk.models.json.signaling.Signaling; import com.nextcloud.talk.models.json.signaling.SignalingOverall; @@ -2236,9 +2235,6 @@ public class CallActivity extends CallBaseActivity { @Subscribe(threadMode = ThreadMode.BACKGROUND) public void onMessageEvent(SessionDescriptionSendEvent sessionDescriptionSend) throws IOException { - NCMessageWrapper ncMessageWrapper = new NCMessageWrapper(); - ncMessageWrapper.setEv("message"); - ncMessageWrapper.setSessionId(callSession); NCSignalingMessage ncSignalingMessage = new NCSignalingMessage(); ncSignalingMessage.setTo(sessionDescriptionSend.getPeerId()); ncSignalingMessage.setRoomType(sessionDescriptionSend.getVideoStreamType()); @@ -2253,17 +2249,16 @@ public class CallActivity extends CallBaseActivity { ncMessagePayload.setIceCandidate(sessionDescriptionSend.getNcIceCandidate()); } - - // Set all we need ncSignalingMessage.setPayload(ncMessagePayload); - ncMessageWrapper.setSignalingMessage(ncSignalingMessage); - if (!hasExternalSignalingServer) { + // The message wrapper can not be defined in a JSON model to be directly serialized, as sent messages + // need to be serialized twice; first the signaling message, and then the wrapper as a whole. Received + // messages, on the other hand, just need to be deserialized once. StringBuilder stringBuilder = new StringBuilder(); stringBuilder.append("{") .append("\"fn\":\"") - .append(StringEscapeUtils.escapeJson(LoganSquare.serialize(ncMessageWrapper.getSignalingMessage()))) + .append(StringEscapeUtils.escapeJson(LoganSquare.serialize(ncSignalingMessage))) .append("\"") .append(",") .append("\"sessionId\":")