From 6cad0660d26b87012af3c533e8552a35036bcdce Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Wed, 29 Nov 2017 11:29:01 +0100
Subject: [PATCH] Clean up

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../webrtc/MagicPeerConnectionWrapper.java    | 28 +++----------------
 1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
index 0390b7506..de50b2ac5 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
@@ -49,9 +49,7 @@ public class MagicPeerConnectionWrapper {
     private static PeerConnection peerConnection;
     List<IceCandidate> iceCandidates = new ArrayList<>();
     private List<PeerConnection.IceServer> iceServers;
-    private List<NCIceCandidate> localCandidates = new ArrayList<>();
     private String sessionId;
-    private String localSession;
     private String nick;
     private MediaConstraints mediaConstraints;
     private DataChannel magicDataChannel;
@@ -78,23 +76,12 @@ public class MagicPeerConnectionWrapper {
         }
 
         this.sessionId = sessionId;
-        this.localSession = localSession;
         this.mediaConstraints = mediaConstraints;
 
         magicSdpObserver = new MagicSdpObserver();
 
     }
 
-
-    public void sendLocalCandidates() {
-        for (NCIceCandidate ncIceCandidate : localCandidates) {
-            EventBus.getDefault().post(new SessionDescriptionSendEvent(null, sessionId,
-                    "candidate", ncIceCandidate));
-        }
-
-        localCandidates = new ArrayList<>();
-    }
-
     public void drainIceCandidates() {
 
         for (IceCandidate iceCandidate : iceCandidates) {
@@ -212,12 +199,6 @@ public class MagicPeerConnectionWrapper {
             ncIceCandidate.setSdpMid(iceCandidate.sdpMid);
             ncIceCandidate.setSdpMLineIndex(iceCandidate.sdpMLineIndex);
             ncIceCandidate.setCandidate(iceCandidate.sdp);
-                /*if (peerConnection.getRemoteDescription() == null) {
-                    localCandidates.add(ncIceCandidate);
-                } else {
-                    EventBus.getDefault().post(new SessionDescriptionSendEvent(null, sessionId,
-                            "candidate", ncIceCandidate));
-                }*/
             EventBus.getDefault().post(new SessionDescriptionSendEvent(null, sessionId,
                     "candidate", ncIceCandidate));
         }
@@ -229,15 +210,15 @@ public class MagicPeerConnectionWrapper {
 
         @Override
         public void onAddStream(MediaStream mediaStream) {
-            videoOn = mediaStream.videoTracks.size() == 1;
-            audioOn = mediaStream.audioTracks.size() == 1;
+            videoOn = mediaStream.videoTracks != null && mediaStream.videoTracks.size() == 1;
+            audioOn = mediaStream.audioTracks != null && mediaStream.audioTracks.size() == 1;
             EventBus.getDefault().post(new MediaStreamEvent(mediaStream, sessionId));
         }
 
         @Override
         public void onRemoveStream(MediaStream mediaStream) {
-            videoOn = mediaStream.videoTracks.size() == 1;
-            audioOn = mediaStream.audioTracks.size() == 1;
+            videoOn = mediaStream.videoTracks != null && mediaStream.videoTracks.size() == 1;
+            audioOn = mediaStream.audioTracks != null && mediaStream.audioTracks.size() == 1;
         }
 
         @Override
@@ -294,7 +275,6 @@ public class MagicPeerConnectionWrapper {
                         peerConnection.getLocalDescription().type.canonicalForm(), null));
             } else if (peerConnection.getRemoteDescription() != null) {
                 drainIceCandidates();
-                sendLocalCandidates();
             }
         }
     }