gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Close connection if ICE fails

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2017-12-09 20:49:02 +01:00
parent 8aee1afa2b
commit 9f00096d98
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/activities/CallActivity.java
View File

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

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

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