From 3f4d249838c946913a681e9b62903a7e73a40722 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Wed, 17 Oct 2018 21:27:53 +0200 Subject: [PATCH] Clean ups --- .../talk/models/json/websocket/CallWebSocketMessage.java | 2 +- .../java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java | 1 - .../com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java index 244c360e4..fff246477 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/websocket/CallWebSocketMessage.java @@ -33,7 +33,7 @@ import lombok.Data; @Parcel public class CallWebSocketMessage { @JsonField(name = "recipient") - ActorWebSocketMessage actorWebSocketMessage; + ActorWebSocketMessage recipientWebSocketMessage; @JsonField(name = "sender") ActorWebSocketMessage senderWebSocketMessage; diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java index dfbe91565..cfe64b456 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java @@ -127,7 +127,6 @@ public class MagicWebSocketInstance extends WebSocketListener { } break; case "event": - // Nothing for now EventOverallWebSocketMessage eventOverallWebSocketMessage = LoganSquare.parse(text, EventOverallWebSocketMessage.class); if (eventOverallWebSocketMessage.getEventMap() != null) { String target = (String) eventOverallWebSocketMessage.getEventMap().get("target"); diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java index f3ac9c5cf..39f9dba2a 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/WebSocketConnectionHelper.java @@ -146,7 +146,7 @@ public class WebSocketConnectionHelper { ActorWebSocketMessage actorWebSocketMessage = new ActorWebSocketMessage(); actorWebSocketMessage.setType("session"); actorWebSocketMessage.setSessionId(ncMessageWrapper.getSignalingMessage().getTo()); - callWebSocketMessage.setActorWebSocketMessage(actorWebSocketMessage); + callWebSocketMessage.setRecipientWebSocketMessage(actorWebSocketMessage); callWebSocketMessage.setNcSignalingMessage(ncMessageWrapper.getSignalingMessage()); callOverallWebSocketMessage.setCallWebSocketMessage(callWebSocketMessage);