From 0ecd90a45c936d6db22b95681d93be95541f77d5 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 21 Nov 2017 12:15:35 +0100
Subject: [PATCH] Clean up

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 .../talk/activities/CallActivity.java         |  7 ++---
 .../talk/webrtc/PeerConnectionWrapper.java    | 28 +------------------
 2 files changed, 3 insertions(+), 32 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 64d42991d..5e34f8841 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
+++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
@@ -473,7 +473,7 @@ public class CallActivity extends AppCompatActivity {
         }
 
         for (PeerConnectionWrapper peerConnectionWrapper : peerConnectionWrapperList) {
-            if (!peerConnectionWrapper.isLocal()) {
+            if (!peerConnectionWrapper.getSessionId().equals(callSession)) {
                 oldSesssions.add(peerConnectionWrapper.getSessionId());
             }
         }
@@ -525,7 +525,7 @@ public class CallActivity extends AppCompatActivity {
             return peerConnectionWrapper;
         } else {
                 peerConnectionWrapper = new PeerConnectionWrapper(peerConnectionFactory,
-                        iceServers, sdpConstraints, sessionId, isLocalPeer, callSession);
+                        iceServers, sdpConstraints, sessionId);
                 peerConnectionWrapper.getPeerConnection().addStream(localMediaStream);
             peerConnectionWrapperList.add(peerConnectionWrapper);
             return peerConnectionWrapper;
@@ -611,7 +611,6 @@ public class CallActivity extends AppCompatActivity {
 
             if (stream.audioTracks.size() == 1) {
                 AudioTrack audioTrack = stream.audioTracks.get(0);
-                Log.d("MARIO", "BL");
             }
         }
 
@@ -659,12 +658,10 @@ public class CallActivity extends AppCompatActivity {
 
     @Subscribe(threadMode = ThreadMode.BACKGROUND)
     public void onMessageEvent(SessionDescriptionSendEvent sessionDescriptionSend) throws IOException {
-        Log.d("MARIO_123", "SENDING " + sessionDescriptionSend.getType());
         String credentials = ApiHelper.getCredentials(userEntity.getUsername(), userEntity.getToken());
         NCMessageWrapper ncMessageWrapper = new NCMessageWrapper();
         ncMessageWrapper.setEv("message");
         ncMessageWrapper.setSessionId(callSession);
-        // Create signaling message and payload
         NCSignalingMessage ncSignalingMessage = new NCSignalingMessage();
         ncSignalingMessage.setTo(sessionDescriptionSend.getPeerId());
         ncSignalingMessage.setRoomType("video");
diff --git a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
index 46e589bd1..703bb05fe 100644
--- a/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
+++ b/app/src/main/java/com/nextcloud/talk/webrtc/PeerConnectionWrapper.java
@@ -45,24 +45,18 @@ public class PeerConnectionWrapper {
     private static PeerConnection peerConnection;
     List<IceCandidate> iceCandidates = new ArrayList<>();
     List<PeerConnection.IceServer> iceServers;
-    List<IceCandidate> candidatesToSend = new ArrayList<>();
-    List<SessionDescription> sessionDescriptionsQueue = new ArrayList<>();
     List<NCIceCandidate> localCandidates = new ArrayList<>();
-    List<SessionDescriptionSendEvent> sessionDescriptionSendEvents = new ArrayList<>();
     private String sessionId;
-    private String callToken;
     private String nick;
-    private boolean local;
     private MediaConstraints mediaConstraints;
     private DataChannel dataChannel;
     private MagicSdpObserver magicSdpObserver;
     private MagicPeerConnectionObserver magicPeerConnectionObserver;
-    private boolean isInitiator;
 
     public PeerConnectionWrapper(PeerConnectionFactory peerConnectionFactory,
                                  List<PeerConnection.IceServer> iceServerList,
                                  MediaConstraints mediaConstraints,
-                                 String sessionId, boolean isLocalPeer, String callToken) {
+                                 String sessionId) {
 
         this.iceServers = iceServerList;
 
@@ -74,7 +68,6 @@ public class PeerConnectionWrapper {
 
             @Override
             public void onIceConnectionChange(PeerConnection.IceConnectionState iceConnectionState) {
-                Log.d("MARIO_ICE", iceConnectionState.name());
             }
 
             @Override
@@ -84,15 +77,11 @@ public class PeerConnectionWrapper {
 
             @Override
             public void onSignalingChange(PeerConnection.SignalingState signalingState) {
-                Log.d("MARIO", signalingState.name());
             }
 
 
             @Override
             public void onIceGatheringChange(PeerConnection.IceGatheringState iceGatheringState) {
-                /*if (iceGatheringState.equals(PeerConnection.IceGatheringState.COMPLETE)) {
-                    sendLocalCandidates();
-                }*/
             }
 
             @Override
@@ -115,10 +104,7 @@ public class PeerConnectionWrapper {
                 magicPeerConnectionObserver);
 
         this.sessionId = sessionId;
-        this.local = isLocalPeer;
         this.mediaConstraints = mediaConstraints;
-        this.callToken = callToken;
-        isInitiator = this.sessionId.compareTo(callToken) < 0;
 
         magicSdpObserver = new MagicSdpObserver() {
             @Override
@@ -173,7 +159,6 @@ public class PeerConnectionWrapper {
     }
 
     public void drainIceCandidates() {
-        Log.d("MARIO", "DRAINING");
 
         for (IceCandidate iceCandidate : iceCandidates) {
             peerConnection.addIceCandidate(iceCandidate);
@@ -188,12 +173,9 @@ public class PeerConnectionWrapper {
     }
 
     public void addCandidate(IceCandidate iceCandidate) {
-        Log.d("MARIO", "RECEIVING CANDIDATE");
         if (peerConnection.getRemoteDescription() != null) {
-            Log.d("MARIO", "DIRECT ADDING");
             peerConnection.addIceCandidate(iceCandidate);
         } else {
-            Log.d("MARIO", "DIRECT QUEUE");
             iceCandidates.add(iceCandidate);
         }
     }
@@ -204,14 +186,6 @@ public class PeerConnectionWrapper {
     }
 
 
-    public boolean isLocal() {
-        return local;
-    }
-
-    public void setLocal(boolean local) {
-        this.local = local;
-    }
-
     public PeerConnection getPeerConnection() {
         return peerConnection;
     }