TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle ice candidate for stale call

Browse Source 
Fixes #6373
Fixes #6305
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-06-13 09:21:42 -07:00
parent 52311eb881
commit f92d768be5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/service/WebRtcCallService.java
View File

@ -490,6 +490,7 @@ public class WebRtcCallService extends Service implements InjectableType, PeerCo
private void handleLocalIceCandidate(Intent intent) { private void handleLocalIceCandidate(Intent intent) {
if (callState == CallState.STATE_IDLE || !Util.isEquals(this.callId, getCallId(intent))) { if (callState == CallState.STATE_IDLE || !Util.isEquals(this.callId, getCallId(intent))) {
Log.w(TAG, "State is now idle, ignoring ice candidate..."); Log.w(TAG, "State is now idle, ignoring ice candidate...");
return;
} }
if (recipient == null || callId == null) { if (recipient == null || callId == null) {
@ -501,6 +502,7 @@ public class WebRtcCallService extends Service implements InjectableType, PeerCo
intent.getStringExtra(EXTRA_ICE_SDP)); intent.getStringExtra(EXTRA_ICE_SDP));
if (pendingIceUpdates != null) { if (pendingIceUpdates != null) {
Log.w(TAG, "Adding to pending ice candidates...");
this.pendingIceUpdates.add(iceUpdateMessage); this.pendingIceUpdates.add(iceUpdateMessage);
return; return;
} }
@ -1005,6 +1007,7 @@ public class WebRtcCallService extends Service implements InjectableType, PeerCo
intent.putExtra(EXTRA_ICE_SDP_MID, candidate.sdpMid); intent.putExtra(EXTRA_ICE_SDP_MID, candidate.sdpMid);
intent.putExtra(EXTRA_ICE_SDP_LINE_INDEX, candidate.sdpMLineIndex); intent.putExtra(EXTRA_ICE_SDP_LINE_INDEX, candidate.sdpMLineIndex);
intent.putExtra(EXTRA_ICE_SDP, candidate.sdp); intent.putExtra(EXTRA_ICE_SDP, candidate.sdp);
intent.putExtra(EXTRA_CALL_ID, callId);
startService(intent); startService(intent);
} }