浏览代码

Fix cleanups

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 7 年之前
父节点
当前提交
d54a46f62f

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

@@ -784,7 +784,8 @@ public class CallActivity extends AppCompatActivity {
                                                                 try {
                                                                     receivedSignalingMessage(signalingOverall.getOcs().getSignalings().get(i));
                                                                 } catch (IOException e) {
-                                                                    e.printStackTrace();
+                                                                    Log.e(TAG, "Filed to process received signaling " +
+                                                                            "message");
                                                                 }
                                                             }
                                                         }
@@ -792,7 +793,6 @@ public class CallActivity extends AppCompatActivity {
 
                                                     @Override
                                                     public void onError(Throwable e) {
-                                                        Log.d("MARIO_DEBUG", e.getLocalizedMessage());
                                                         dispose(signalingDisposable);
                                                     }
 
@@ -939,7 +939,7 @@ public class CallActivity extends AppCompatActivity {
 
 
     private void deleteMagicPeerConnection(MagicPeerConnectionWrapper magicPeerConnectionWrapper) {
-        magicPeerConnectionWrapper.removePeerConnection(magicPeerConnectionWrapperList.size() == 1);
+        magicPeerConnectionWrapper.removePeerConnection();
         magicPeerConnectionWrapperList.remove(magicPeerConnectionWrapper);
     }
 

+ 2 - 6
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java

@@ -92,13 +92,9 @@ public class MagicPeerConnectionWrapper {
         }
     }
 
-    public void removePeerConnection(boolean isFinal) {
-        if (peerConnection != null && localMediaStream != null) {
+    public void removePeerConnection() {
+        if (peerConnection != null) {
             peerConnection.close();
-            peerConnection.removeStream(localMediaStream);
-            if (isFinal) {
-                peerConnection.dispose();
-            }
             peerConnection = null;
         }
     }