From 0705451921c89bfeb9221e3ece729f9c38eb8b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= <danxuliu@gmail.com>
Date: Wed, 23 Oct 2024 12:59:56 +0200
Subject: [PATCH] Fix handling of end call for all with external signaling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When the message applies to all participants the property is all in
lower case. The comparison is case sensitive, so the message was ignored
and the call was not left by the Talk Android app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
---
 .../talk/signaling/SignalingMessageReceiver.java     |  2 +-
 .../SignalingMessageReceiverParticipantListTest.java | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

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..f2808791c 100644
--- a/app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.java
+++ b/app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.java
@@ -373,7 +373,7 @@ public abstract class SignalingMessageReceiver {
 
         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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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);