From e3581f03f56ef1bc93a52e01c881140bb4cd3600 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Thu, 10 May 2018 21:49:23 +0200 Subject: [PATCH] Fix case of no media stream from remote Signed-off-by: Mario Danic --- .../talk/webrtc/MagicPeerConnectionWrapper.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 2978aee2f..298e32b81 100644 --- a/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java +++ b/app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java @@ -59,6 +59,7 @@ public class MagicPeerConnectionWrapper { private MediaConstraints mediaConstraints; private DataChannel magicDataChannel; private MagicSdpObserver magicSdpObserver; + private MediaStream remoteMediaStream; private boolean remoteVideoOn; private boolean remoteAudioOn; @@ -250,8 +251,10 @@ public class MagicPeerConnectionWrapper { @Override public void onIceConnectionChange(PeerConnection.IceConnectionState iceConnectionState) { if (iceConnectionState.equals(PeerConnection.IceConnectionState.CONNECTED)) { - EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType - .PEER_CONNECTED, sessionId, null, null)); + /*EventBus.getDefault().post(new PeerConnectionEvent(PeerConnectionEvent.PeerConnectionEventType + .PEER_CONNECTED, sessionId, null, null));*/ + EventBus.getDefault().post(new MediaStreamEvent(remoteMediaStream, sessionId)); + if (hasInitiated) { sendInitialMediaStatus(); } @@ -288,7 +291,7 @@ public class MagicPeerConnectionWrapper { @Override public void onAddStream(MediaStream mediaStream) { - EventBus.getDefault().post(new MediaStreamEvent(mediaStream, sessionId)); + remoteMediaStream = mediaStream; } @Override