mirrors/nextcloud-talk-android
1
0
Fork 0
mirror of https://github.com/nextcloud/talk-android.git synced 2024-11-27 17:08:34 +03:00
Code Issues Projects Releases Packages 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) {
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

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

@ -110,7 +110,10 @@ public class MagicPeerConnectionWrapper {
}
if (peerConnection != null) {
peerConnection.removeStream(localMediaStream);
if (localMediaStream != null) {
peerConnection.removeStream(localMediaStream);
}
peerConnection.close();
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");
switch (target) {
case "room":
if (eventOverallWebSocketMessage.getType().equals("message") && eventOverallWebSocketMessage.getEventMap() != null) {
if (eventOverallWebSocketMessage.getType().equals("message")) {
if (eventOverallWebSocketMessage.getEventMap().containsKey("data")) {
Map<String, Object> dataHashMap = (Map<String, Object>) eventOverallWebSocketMessage.getEventMap().get("data");
if (dataHashMap.containsKey("chat")) {
@ -152,11 +152,11 @@ public class MagicWebSocketInstance extends WebSocketListener {
}
break;
case "participants":
if (eventOverallWebSocketMessage.getType().equals("update") && eventOverallWebSocketMessage.getEventMap() != null) {
Map<String, Object> participantsUpdateMap = eventOverallWebSocketMessage.getEventMap();
if (eventOverallWebSocketMessage.getEventMap().get("type").equals("update")) {
HashMap<String, String> refreshChatHashMap = new HashMap<>();
refreshChatHashMap.put("roomToken", (String) eventOverallWebSocketMessage.getEventMap().get("roomid"));
refreshChatHashMap.put("jobId", Integer.toString(magicMap.add(participantsUpdateMap.get("users"))));
HashMap<String, Object> updateEventMap = (HashMap<String, Object>) eventOverallWebSocketMessage.getEventMap().get("update");
refreshChatHashMap.put("roomToken", (String) updateEventMap.get("roomid"));
refreshChatHashMap.put("jobId", Integer.toString(magicMap.add(updateEventMap.get("users"))));
eventBus.post(new WebSocketCommunicationEvent("participantsUpdate", refreshChatHashMap));
}
break;