diff --git a/app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.java b/app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.java index fb3e9c191..397ba7b55 100644 --- a/app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.java +++ b/app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.java @@ -370,10 +370,13 @@ public abstract class SignalingMessageReceiver { // }, // }, // } + // + // Note that "incall" in participants->update is all in lower case when the message applies to all participants, + // even if it is "inCall" when the message provides separate properties for each participant. long inCall; try { - inCall = Long.parseLong(updateMap.get("inCall").toString()); + inCall = Long.parseLong(updateMap.get("incall").toString()); } catch (RuntimeException e) { // Broken message, this should not happen. return; diff --git a/app/src/test/java/com/nextcloud/talk/signaling/SignalingMessageReceiverParticipantListTest.java b/app/src/test/java/com/nextcloud/talk/signaling/SignalingMessageReceiverParticipantListTest.java index fa1e14220..85214e51d 100644 --- a/app/src/test/java/com/nextcloud/talk/signaling/SignalingMessageReceiverParticipantListTest.java +++ b/app/src/test/java/com/nextcloud/talk/signaling/SignalingMessageReceiverParticipantListTest.java @@ -322,7 +322,7 @@ public class SignalingMessageReceiverParticipantListTest { Map updateMap = new HashMap<>(); updateMap.put("roomId", 108); updateMap.put("all", true); - updateMap.put("inCall", 0); + updateMap.put("incall", 0); eventMap.put("update", updateMap); signalingMessageReceiver.processEvent(eventMap); @@ -343,7 +343,7 @@ public class SignalingMessageReceiverParticipantListTest { HashMap updateMap = new HashMap<>(); updateMap.put("roomId", 108); updateMap.put("all", true); - updateMap.put("inCall", 0); + updateMap.put("incall", 0); eventMap.put("update", updateMap); signalingMessageReceiver.processEvent(eventMap); @@ -370,7 +370,7 @@ public class SignalingMessageReceiverParticipantListTest { HashMap updateMap = new HashMap<>(); updateMap.put("roomId", 108); updateMap.put("all", true); - updateMap.put("inCall", 0); + updateMap.put("incall", 0); eventMap.put("update", updateMap); signalingMessageReceiver.processEvent(eventMap); @@ -393,7 +393,7 @@ public class SignalingMessageReceiverParticipantListTest { HashMap updateMap = new HashMap<>(); updateMap.put("roomId", 108); updateMap.put("all", true); - updateMap.put("inCall", 0); + updateMap.put("incall", 0); eventMap.put("update", updateMap); signalingMessageReceiver.processEvent(eventMap); @@ -420,7 +420,7 @@ public class SignalingMessageReceiverParticipantListTest { HashMap updateMap = new HashMap<>(); updateMap.put("roomId", 108); updateMap.put("all", true); - updateMap.put("inCall", 0); + updateMap.put("incall", 0); eventMap.put("update", updateMap); signalingMessageReceiver.processEvent(eventMap); @@ -449,7 +449,7 @@ public class SignalingMessageReceiverParticipantListTest { HashMap updateMap = new HashMap<>(); updateMap.put("roomId", 108); updateMap.put("all", true); - updateMap.put("inCall", 0); + updateMap.put("incall", 0); eventMap.put("update", updateMap); signalingMessageReceiver.processEvent(eventMap);