mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-24 05:55:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Clean ups

Browse source
This commit is contained in:
Mario Danic 2018-10-17 21:27:53 +02:00
parent 5dd36a2fcc
commit 3f4d249838
3 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java
View file

@ -33,7 +33,7 @@ import lombok.Data;
@Parcel @Parcel
public class CallWebSocketMessage { public class CallWebSocketMessage {
@JsonField(name = "recipient") @JsonField(name = "recipient")
ActorWebSocketMessage actorWebSocketMessage; ActorWebSocketMessage recipientWebSocketMessage;
@JsonField(name = "sender") @JsonField(name = "sender")
ActorWebSocketMessage senderWebSocketMessage; ActorWebSocketMessage senderWebSocketMessage;

1
app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
View file

@ -127,7 +127,6 @@ public class MagicWebSocketInstance extends WebSocketListener {
} }
break; break;
case "event": case "event":
// Nothing for now
EventOverallWebSocketMessage eventOverallWebSocketMessage = LoganSquare.parse(text, EventOverallWebSocketMessage.class); EventOverallWebSocketMessage eventOverallWebSocketMessage = LoganSquare.parse(text, EventOverallWebSocketMessage.class);
if (eventOverallWebSocketMessage.getEventMap() != null) { if (eventOverallWebSocketMessage.getEventMap() != null) {
String target = (String) eventOverallWebSocketMessage.getEventMap().get("target"); String target = (String) eventOverallWebSocketMessage.getEventMap().get("target");

2
app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java
View file

@ -146,7 +146,7 @@ public class WebSocketConnectionHelper {
ActorWebSocketMessage actorWebSocketMessage = new ActorWebSocketMessage(); ActorWebSocketMessage actorWebSocketMessage = new ActorWebSocketMessage();
actorWebSocketMessage.setType("session"); actorWebSocketMessage.setType("session");
actorWebSocketMessage.setSessionId(ncMessageWrapper.getSignalingMessage().getTo()); actorWebSocketMessage.setSessionId(ncMessageWrapper.getSignalingMessage().getTo());
callWebSocketMessage.setActorWebSocketMessage(actorWebSocketMessage); callWebSocketMessage.setRecipientWebSocketMessage(actorWebSocketMessage);
callWebSocketMessage.setNcSignalingMessage(ncMessageWrapper.getSignalingMessage()); callWebSocketMessage.setNcSignalingMessage(ncMessageWrapper.getSignalingMessage());
callOverallWebSocketMessage.setCallWebSocketMessage(callWebSocketMessage); callOverallWebSocketMessage.setCallWebSocketMessage(callWebSocketMessage);