Replace wrapper with actual message in external signaling server

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>

app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

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

app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java

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

app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java

@@ -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;