Home Explore Help
Sign In
SX_Cloud
/
rooms-android
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Clean up

Mario Danic 6 years ago
parent
f3ff2e247b
commit
9b09848838
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      app/src/main/java/com/nextcloud/talk/controllers/CallController.java
  2. 1 1
      app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File 

@@ -1403,7 +1403,7 @@ public class CallController extends BaseController {
 
                     @Override
 
                     public void onNext(GenericOverall genericOverall) {
 
                         if (hasExternalSignalingServer) {
 
-                            webSocketClient.joinRoomWithRoomTokenAndSession("", "");
 
+                            webSocketClient.joinRoomWithRoomTokenAndSession("", callSession);
 
                         }
 
 
                         if (isMultiSession) {

+ 1 - 1
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
View File 

@@ -91,7 +91,7 @@ public class MagicPeerConnectionWrapper {
 
                 new MagicPeerConnectionObserver());
 
 
         if (peerConnection != null) {
 
-            if (localSession != null && localMediaStream != null) {
 
+            if (localMediaStream != null) {
 
                 peerConnection.addStream(localMediaStream);
 
             }