gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-17 01:35:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Safe guard against crashing

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-01-16 05:33:58 +01:00
parent 90b5055fb2
commit 02c115d49b
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/com/nextcloud/talk/webrtc/MagicPeerConnectionWrapper.java
View File

@ -74,21 +74,25 @@ public class MagicPeerConnectionWrapper {
this.localSession = localSession; this.localSession = localSession;
this.localMediaStream = mediaStream; this.localMediaStream = mediaStream;
peerConnection = peerConnectionFactory.createPeerConnection(iceServerList, mediaConstraints,
new MagicPeerConnectionObserver());
peerConnection.addStream(localMediaStream);
this.sessionId = sessionId; this.sessionId = sessionId;
this.mediaConstraints = mediaConstraints; this.mediaConstraints = mediaConstraints;
magicSdpObserver = new MagicSdpObserver(); magicSdpObserver = new MagicSdpObserver();
hasInitiated = sessionId.compareTo(localSession) < 0; hasInitiated = sessionId.compareTo(localSession) < 0;
if (hasInitiated) {
DataChannel.Init init = new DataChannel.Init(); peerConnection = peerConnectionFactory.createPeerConnection(iceServerList, mediaConstraints,
init.negotiated = false; new MagicPeerConnectionObserver());
magicDataChannel = peerConnection.createDataChannel("status", init);
magicDataChannel.registerObserver(new MagicDataChannelObserver()); if (peerConnection != null) {
peerConnection.createOffer(magicSdpObserver, mediaConstraints); peerConnection.addStream(localMediaStream);
if (hasInitiated) {
DataChannel.Init init = new DataChannel.Init();
init.negotiated = false;
magicDataChannel = peerConnection.createDataChannel("status", init);
magicDataChannel.registerObserver(new MagicDataChannelObserver());
peerConnection.createOffer(magicSdpObserver, mediaConstraints);
}
} }
} }