From 5d9f4456ed1fcd31b5a5871ec39d6da08e6ca823 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 5 Dec 2017 21:52:32 +0100
Subject: [PATCH] Only call folks in call

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../nextcloud/talk/activities/CallActivity.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
index d59cf1126..798a23f0b 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -449,9 +449,9 @@ public class CallActivity extends AppCompatActivity {
                         case "offer":
                         case "answer":
                             magicPeerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick());
-                                magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper
-                                        .getMagicSdpObserver(), new SessionDescription(SessionDescription.Type.fromCanonicalForm(type),
-                                        ncSignalingMessage.getPayload().getSdp()));
+                            magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper
+                                    .getMagicSdpObserver(), new SessionDescription(SessionDescription.Type.fromCanonicalForm(type),
+                                    ncSignalingMessage.getPayload().getSdp()));
                             break;
                         case "candidate":
                             NCIceCandidate ncIceCandidate = ncSignalingMessage.getPayload().getIceCandidate();
@@ -487,14 +487,12 @@ public class CallActivity extends AppCompatActivity {
         List<String> oldSesssions = new ArrayList<>();
 
         for (HashMap<String, String> participant : users) {
-            if (participant.containsKey("sessionId") && !participant.get("sessionId").equals
-                    (callSession)) {
+            if (!participant.get("sessionId").equals(callSession) && Boolean.parseBoolean(participant.get("inCall"))) {
                 newSessions.add(participant.get("sessionId"));
             }
         }
 
 
-
         for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
             if (!magicPeerConnectionWrapper.getSessionId().equals(callSession)) {
                 oldSesssions.add(magicPeerConnectionWrapper.getSessionId());
@@ -531,8 +529,8 @@ public class CallActivity extends AppCompatActivity {
 
     private MagicPeerConnectionWrapper alwaysGetPeerConnectionWrapperForSessionId(String sessionId) {
         MagicPeerConnectionWrapper magicPeerConnectionWrapper;
-            if ((magicPeerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) {
-                return magicPeerConnectionWrapper;
+        if ((magicPeerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) {
+            return magicPeerConnectionWrapper;
         } else {
             magicPeerConnectionWrapper = new MagicPeerConnectionWrapper(peerConnectionFactory,
                     iceServers, sdpConstraints, sessionId, callSession);