Quellcode durchsuchen

Revert "Close connection if ICE fails"

This reverts commit 9f00096d98a7489ac64c34beb8a348efe6cb182c.
Mario Danic vor 7 Jahren
Ursprung
Commit
e1b844c669

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

@@ -510,7 +510,7 @@ public class CallActivity extends AppCompatActivity {
 
                             SessionDescription sessionDescriptionWithPreferredCodec = new SessionDescription(
                                     SessionDescription.Type.fromCanonicalForm(type),
-                                    ncSignalingMessage.getPayload().getSdp());
+                                    sessionDescriptionStringWithPreferredCodec);
 
                             magicPeerConnectionWrapper.getPeerConnection().setRemoteDescription(magicPeerConnectionWrapper
                                     .getMagicSdpObserver(), sessionDescriptionWithPreferredCodec);

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

@@ -194,9 +194,6 @@ public class MagicPeerConnectionWrapper {
             if (iceConnectionState.equals(PeerConnection.IceConnectionState.CONNECTED) && hasInitiated) {
                 sendChannelData(new DataChannelMessage("videoOn"));
                 sendChannelData(new DataChannelMessage("audioOn"));
-            } else if (iceConnectionState.equals(PeerConnection.IceConnectionState.FAILED)) {
-                EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType
-                        .CLOSE_PEER, sessionId));
             }
         }
 
@@ -285,9 +282,9 @@ public class MagicPeerConnectionWrapper {
                     sessionDescription.type,
                     sessionDescriptionStringWithPreferredCodec);
 
-            EventBus.getDefault().post(new SessionDescriptionSendEvent(sessionDescription, sessionId,
+            EventBus.getDefault().post(new SessionDescriptionSendEvent(sessionDescriptionWithPreferredCodec, sessionId,
                     sessionDescription.type.canonicalForm().toLowerCase(), null));
-            peerConnection.setLocalDescription(magicSdpObserver, sessionDescription);
+            peerConnection.setLocalDescription(magicSdpObserver, sessionDescriptionWithPreferredCodec);
         }
 
         @Override