gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug with init a hashmap

Browse Source
This commit is contained in:
Mario Danic 2018-11-09 22:42:14 +01:00
parent 8de3abe6c8
commit 1e055568bc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/nextcloud/talk/webrtc/MagicWebSocketInstance.java
View File

@ -91,6 +91,7 @@ public class MagicWebSocketInstance extends WebSocketListener {
this.webSocketTicket = webSocketTicket; this.webSocketTicket = webSocketTicket;
this.webSocketConnectionHelper = new WebSocketConnectionHelper(); this.webSocketConnectionHelper = new WebSocketConnectionHelper();
this.displayNameHashMap = new HashMap<>(); this.displayNameHashMap = new HashMap<>();
this.userIdSesssionHashMap = new HashMap<>();
magicMap = new MagicMap(); magicMap = new MagicMap();
restartWebSocket(); restartWebSocket();
@ -123,12 +124,12 @@ public class MagicWebSocketInstance extends WebSocketListener {
String messageType = baseWebSocketMessage.getType(); String messageType = baseWebSocketMessage.getType();
switch (messageType) { switch (messageType) {
case "hello": case "hello":
connected = true;
restartCount = 0; restartCount = 0;
HelloResponseOverallWebSocketMessage helloResponseWebSocketMessage = LoganSquare.parse(text, HelloResponseOverallWebSocketMessage.class); HelloResponseOverallWebSocketMessage helloResponseWebSocketMessage = LoganSquare.parse(text, HelloResponseOverallWebSocketMessage.class);
resumeId = helloResponseWebSocketMessage.getHelloResponseWebSocketMessage().getResumeId(); resumeId = helloResponseWebSocketMessage.getHelloResponseWebSocketMessage().getResumeId();
sessionId = helloResponseWebSocketMessage.getHelloResponseWebSocketMessage().getSessionId(); sessionId = helloResponseWebSocketMessage.getHelloResponseWebSocketMessage().getSessionId();
hasMCU = helloResponseWebSocketMessage.getHelloResponseWebSocketMessage().serverHasMCUSupport(); hasMCU = helloResponseWebSocketMessage.getHelloResponseWebSocketMessage().serverHasMCUSupport();
connected = true;
eventBus.post(new WebSocketCommunicationEvent("hello", null)); eventBus.post(new WebSocketCommunicationEvent("hello", null));
break; break;
case "error": case "error":
@ -156,7 +157,7 @@ public class MagicWebSocketInstance extends WebSocketListener {
String target = (String) eventOverallWebSocketMessage.getEventMap().get("target"); String target = (String) eventOverallWebSocketMessage.getEventMap().get("target");
switch (target) { switch (target) {
case "room": case "room":
if (eventOverallWebSocketMessage.getType().equals("message")) { if (eventOverallWebSocketMessage.getEventMap().get("type").equals("message")) {
if (eventOverallWebSocketMessage.getEventMap().containsKey("data")) { if (eventOverallWebSocketMessage.getEventMap().containsKey("data")) {
Map<String, Object> dataHashMap = (Map<String, Object>) eventOverallWebSocketMessage.getEventMap().get("data"); Map<String, Object> dataHashMap = (Map<String, Object>) eventOverallWebSocketMessage.getEventMap().get("data");
if (dataHashMap.containsKey("chat")) { if (dataHashMap.containsKey("chat")) {