Эх сурвалжийг харах

Only call folks in call

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 жил өмнө
parent
commit
5d9f4456ed

+ 6 - 8
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java

@@ -449,9 +449,9 @@ public class CallActivity extends AppCompatActivity {
                         case "offer":
                         case "offer":
                         case "answer":
                         case "answer":
                             magicPeerConnectionWrapper.setNick(ncSignalingMessage.getPayload().getNick());
                             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;
                             break;
                         case "candidate":
                         case "candidate":
                             NCIceCandidate ncIceCandidate = ncSignalingMessage.getPayload().getIceCandidate();
                             NCIceCandidate ncIceCandidate = ncSignalingMessage.getPayload().getIceCandidate();
@@ -487,14 +487,12 @@ public class CallActivity extends AppCompatActivity {
         List<String> oldSesssions = new ArrayList<>();
         List<String> oldSesssions = new ArrayList<>();
 
 
         for (HashMap<String, String> participant : users) {
         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"));
                 newSessions.add(participant.get("sessionId"));
             }
             }
         }
         }
 
 
 
 
-
         for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
         for (MagicPeerConnectionWrapper magicPeerConnectionWrapper : magicPeerConnectionWrapperList) {
             if (!magicPeerConnectionWrapper.getSessionId().equals(callSession)) {
             if (!magicPeerConnectionWrapper.getSessionId().equals(callSession)) {
                 oldSesssions.add(magicPeerConnectionWrapper.getSessionId());
                 oldSesssions.add(magicPeerConnectionWrapper.getSessionId());
@@ -531,8 +529,8 @@ public class CallActivity extends AppCompatActivity {
 
 
     private MagicPeerConnectionWrapper alwaysGetPeerConnectionWrapperForSessionId(String sessionId) {
     private MagicPeerConnectionWrapper alwaysGetPeerConnectionWrapperForSessionId(String sessionId) {
         MagicPeerConnectionWrapper magicPeerConnectionWrapper;
         MagicPeerConnectionWrapper magicPeerConnectionWrapper;
-            if ((magicPeerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) {
-                return magicPeerConnectionWrapper;
+        if ((magicPeerConnectionWrapper = getPeerConnectionWrapperForSessionId(sessionId)) != null) {
+            return magicPeerConnectionWrapper;
         } else {
         } else {
             magicPeerConnectionWrapper = new MagicPeerConnectionWrapper(peerConnectionFactory,
             magicPeerConnectionWrapper = new MagicPeerConnectionWrapper(peerConnectionFactory,
                     iceServers, sdpConstraints, sessionId, callSession);
                     iceServers, sdpConstraints, sessionId, callSession);