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

Merge pull request #4371 from nextcloud/fix-handling-of-end-call-for-all-with-external-signaling

Browse Source 
Fix handling of end call for everyone with external signaling
This commit is contained in:
Marcel Hibbe 2024-10-23 15:02:26 +02:00 committed by GitHub
commit b42824a5a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/nextcloud/talk/signaling/SignalingMessageReceiver.java
View File

@ -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; long inCall;
try { try {
inCall = Long.parseLong(updateMap.get("inCall").toString()); inCall = Long.parseLong(updateMap.get("incall").toString());
} catch (RuntimeException e) { } catch (RuntimeException e) {
// Broken message, this should not happen. // Broken message, this should not happen.
return; return;

12
app/src/test/java/com/nextcloud/talk/signaling/SignalingMessageReceiverParticipantListTest.java
View File

@ -322,7 +322,7 @@ public class SignalingMessageReceiverParticipantListTest {
Map<String, Object> updateMap = new HashMap<>(); Map<String, Object> updateMap = new HashMap<>();
updateMap.put("roomId", 108); updateMap.put("roomId", 108);
updateMap.put("all", true); updateMap.put("all", true);
updateMap.put("inCall", 0); updateMap.put("incall", 0);
eventMap.put("update", updateMap); eventMap.put("update", updateMap);
signalingMessageReceiver.processEvent(eventMap); signalingMessageReceiver.processEvent(eventMap);
@ -343,7 +343,7 @@ public class SignalingMessageReceiverParticipantListTest {
HashMap<String, Object> updateMap = new HashMap<>(); HashMap<String, Object> updateMap = new HashMap<>();
updateMap.put("roomId", 108); updateMap.put("roomId", 108);
updateMap.put("all", true); updateMap.put("all", true);
updateMap.put("inCall", 0); updateMap.put("incall", 0);
eventMap.put("update", updateMap); eventMap.put("update", updateMap);
signalingMessageReceiver.processEvent(eventMap); signalingMessageReceiver.processEvent(eventMap);
@ -370,7 +370,7 @@ public class SignalingMessageReceiverParticipantListTest {
HashMap<String, Object> updateMap = new HashMap<>(); HashMap<String, Object> updateMap = new HashMap<>();
updateMap.put("roomId", 108); updateMap.put("roomId", 108);
updateMap.put("all", true); updateMap.put("all", true);
updateMap.put("inCall", 0); updateMap.put("incall", 0);
eventMap.put("update", updateMap); eventMap.put("update", updateMap);
signalingMessageReceiver.processEvent(eventMap); signalingMessageReceiver.processEvent(eventMap);
@ -393,7 +393,7 @@ public class SignalingMessageReceiverParticipantListTest {
HashMap<String, Object> updateMap = new HashMap<>(); HashMap<String, Object> updateMap = new HashMap<>();
updateMap.put("roomId", 108); updateMap.put("roomId", 108);
updateMap.put("all", true); updateMap.put("all", true);
updateMap.put("inCall", 0); updateMap.put("incall", 0);
eventMap.put("update", updateMap); eventMap.put("update", updateMap);
signalingMessageReceiver.processEvent(eventMap); signalingMessageReceiver.processEvent(eventMap);
@ -420,7 +420,7 @@ public class SignalingMessageReceiverParticipantListTest {
HashMap<String, Object> updateMap = new HashMap<>(); HashMap<String, Object> updateMap = new HashMap<>();
updateMap.put("roomId", 108); updateMap.put("roomId", 108);
updateMap.put("all", true); updateMap.put("all", true);
updateMap.put("inCall", 0); updateMap.put("incall", 0);
eventMap.put("update", updateMap); eventMap.put("update", updateMap);
signalingMessageReceiver.processEvent(eventMap); signalingMessageReceiver.processEvent(eventMap);
@ -449,7 +449,7 @@ public class SignalingMessageReceiverParticipantListTest {
HashMap<String, Object> updateMap = new HashMap<>(); HashMap<String, Object> updateMap = new HashMap<>();
updateMap.put("roomId", 108); updateMap.put("roomId", 108);
updateMap.put("all", true); updateMap.put("all", true);
updateMap.put("inCall", 0); updateMap.put("incall", 0);
eventMap.put("update", updateMap); eventMap.put("update", updateMap);
signalingMessageReceiver.processEvent(eventMap); signalingMessageReceiver.processEvent(eventMap);