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

Fix call message model

Browse Source
This commit is contained in:
Mario Danic 2018-10-16 11:42:37 +02:00
parent 54144b1c8c
commit 568db40816
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java
View File

@ -23,6 +23,7 @@ package com.nextcloud.talk.models.json.websocket;
import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonField;
import com.bluelinelabs.logansquare.annotation.JsonObject; import com.bluelinelabs.logansquare.annotation.JsonObject;
import com.nextcloud.talk.models.json.signaling.NCMessageWrapper; import com.nextcloud.talk.models.json.signaling.NCMessageWrapper;
import com.nextcloud.talk.models.json.signaling.NCSignalingMessage;
import org.parceler.Parcel; import org.parceler.Parcel;
@ -36,5 +37,5 @@ public class CallWebSocketMessage {
RecipientWebSocketMessage recipientWebSocketMessage; RecipientWebSocketMessage recipientWebSocketMessage;
@JsonField(name = "data") @JsonField(name = "data")
NCMessageWrapper ncMessageWrapper; NCSignalingMessage ncSignalingMessage;
} }

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

@ -109,7 +109,7 @@ public class WebSocketConnectionHelper {
return helloOverallWebSocketMessage; return helloOverallWebSocketMessage;
} }
public RoomOverallWebSocketMessage getAssembledJoinOrLeaveRoomModel(String roomId, String sessionId) { RoomOverallWebSocketMessage getAssembledJoinOrLeaveRoomModel(String roomId, String sessionId) {
RoomOverallWebSocketMessage roomOverallWebSocketMessage = new RoomOverallWebSocketMessage(); RoomOverallWebSocketMessage roomOverallWebSocketMessage = new RoomOverallWebSocketMessage();
roomOverallWebSocketMessage.setType("room"); roomOverallWebSocketMessage.setType("room");
RoomWebSocketMessage roomWebSocketMessage = new RoomWebSocketMessage(); RoomWebSocketMessage roomWebSocketMessage = new RoomWebSocketMessage();
@ -119,7 +119,7 @@ public class WebSocketConnectionHelper {
return roomOverallWebSocketMessage; return roomOverallWebSocketMessage;
} }
public RequestOfferOverallWebSocketMessage getAssembledRequestOfferModel(String sessionId, String roomType) { RequestOfferOverallWebSocketMessage getAssembledRequestOfferModel(String sessionId, String roomType) {
RequestOfferOverallWebSocketMessage requestOfferOverallWebSocketMessage = new RequestOfferOverallWebSocketMessage(); RequestOfferOverallWebSocketMessage requestOfferOverallWebSocketMessage = new RequestOfferOverallWebSocketMessage();
requestOfferOverallWebSocketMessage.setType("message"); requestOfferOverallWebSocketMessage.setType("message");
@ -139,7 +139,7 @@ public class WebSocketConnectionHelper {
return requestOfferOverallWebSocketMessage; return requestOfferOverallWebSocketMessage;
} }
public CallOverallWebSocketMessage getAssembledCallMessageModel(NCMessageWrapper ncMessageWrapper) { CallOverallWebSocketMessage getAssembledCallMessageModel(NCMessageWrapper ncMessageWrapper) {
CallOverallWebSocketMessage callOverallWebSocketMessage = new CallOverallWebSocketMessage(); CallOverallWebSocketMessage callOverallWebSocketMessage = new CallOverallWebSocketMessage();
callOverallWebSocketMessage.setType("message"); callOverallWebSocketMessage.setType("message");
@ -149,7 +149,7 @@ public class WebSocketConnectionHelper {
recipientWebSocketMessage.setType("session"); recipientWebSocketMessage.setType("session");
recipientWebSocketMessage.setSessionId(ncMessageWrapper.getSignalingMessage().getTo()); recipientWebSocketMessage.setSessionId(ncMessageWrapper.getSignalingMessage().getTo());
callWebSocketMessage.setRecipientWebSocketMessage(recipientWebSocketMessage); callWebSocketMessage.setRecipientWebSocketMessage(recipientWebSocketMessage);
callWebSocketMessage.setNcMessageWrapper(ncMessageWrapper); callWebSocketMessage.setNcSignalingMessage(ncMessageWrapper.getSignalingMessage());
callOverallWebSocketMessage.setCallWebSocketMessage(callWebSocketMessage); callOverallWebSocketMessage.setCallWebSocketMessage(callWebSocketMessage);
return callOverallWebSocketMessage; return callOverallWebSocketMessage;