gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-13 15:54:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean ups

Browse Source
This commit is contained in:
Mario Danic 2018-10-17 13:20:48 +02:00
parent bd303a1d00
commit db026c4a9e
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -1455,7 +1455,11 @@ public class CallController extends BaseController {
} }
for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) { for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
oldSesssions.add(magicPeerConnectionWrapper.getSessionId()); if (externalSignalingServer != null && callSession.equals(magicPeerConnectionWrapper.getSessionId())) {
oldSesssions.add(magicPeerConnectionWrapper.getSessionId());
} else {
oldSesssions.add(magicPeerConnectionWrapper.getSessionId());
}
} }
// Calculate sessions that left the call // Calculate sessions that left the call

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

@ -110,7 +110,10 @@ public class MagicPeerConnectionWrapper {
} }
if (peerConnection != null) { if (peerConnection != null) {
peerConnection.removeStream(localMediaStream); if (localMediaStream != null) {
peerConnection.removeStream(localMediaStream);
}
peerConnection.close(); peerConnection.close();
peerConnection = null; peerConnection = null;
} }

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

@ -133,7 +133,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") && eventOverallWebSocketMessage.getEventMap() != null) { if (eventOverallWebSocketMessage.getType().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")) {
@ -152,11 +152,11 @@ public class MagicWebSocketInstance extends WebSocketListener {
} }
break; break;
case "participants": case "participants":
if (eventOverallWebSocketMessage.getType().equals("update") && eventOverallWebSocketMessage.getEventMap() != null) { if (eventOverallWebSocketMessage.getEventMap().get("type").equals("update")) {
Map<String, Object> participantsUpdateMap = eventOverallWebSocketMessage.getEventMap();
HashMap<String, String> refreshChatHashMap = new HashMap<>(); HashMap<String, String> refreshChatHashMap = new HashMap<>();
refreshChatHashMap.put("roomToken", (String) eventOverallWebSocketMessage.getEventMap().get("roomid")); HashMap<String, Object> updateEventMap = (HashMap<String, Object>) eventOverallWebSocketMessage.getEventMap().get("update");
refreshChatHashMap.put("jobId", Integer.toString(magicMap.add(participantsUpdateMap.get("users")))); refreshChatHashMap.put("roomToken", (String) updateEventMap.get("roomid"));
refreshChatHashMap.put("jobId", Integer.toString(magicMap.add(updateEventMap.get("users"))));
eventBus.post(new WebSocketCommunicationEvent("participantsUpdate", refreshChatHashMap)); eventBus.post(new WebSocketCommunicationEvent("participantsUpdate", refreshChatHashMap));
} }
break; break;