blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Localize call audio and video activation code

master
Curt Brune 2019-09-27 17:40:33 -07:00 committed by Greyson Parrelli
parent 4f7cba8d7c
commit 8f8f41f184
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -599,21 +599,7 @@ public class WebRtcCallService extends Service implements PeerConnection.Observe
}
}
private void handleCallConnected(Intent intent) {
if (callState != CallState.STATE_REMOTE_RINGING && callState != CallState.STATE_LOCAL_RINGING) {
Log.w(TAG, "Ignoring call connected for unknown state: " + callState);
return;
}
if (!Util.isEquals(this.callId, getCallId(intent))) {
Log.w(TAG, "Ignoring connected for unknown call id: " + getCallId(intent));
return;
}
if (recipient == null || peerConnection == null || dataChannel == null) {
throw new AssertionError("assert");
}
private void activateCallMedia() {
audioManager.startCommunication(callState == CallState.STATE_REMOTE_RINGING);
bluetoothStateManager.setWantsConnection(true);
@ -639,6 +625,24 @@ public class WebRtcCallService extends Service implements PeerConnection.Observe
.build().toByteArray()), false));
}
private void handleCallConnected(Intent intent) {
if (callState != CallState.STATE_REMOTE_RINGING) {
Log.w(TAG, "Ignoring call connected for unknown state: " + callState);
return;
}
if (!Util.isEquals(this.callId, getCallId(intent))) {
Log.w(TAG, "Ignoring connected for unknown call id: " + getCallId(intent));
return;
}
if (recipient == null || peerConnection == null || dataChannel == null) {
throw new AssertionError("assert");
}
activateCallMedia();
}
private void handleBusyCall(Intent intent) {
Recipient recipient = getRemoteRecipient(intent);
long callId = getCallId(intent);
@ -735,9 +739,7 @@ public class WebRtcCallService extends Service implements PeerConnection.Observe
this.peerConnection.setVideoEnabled(false);
this.dataChannel.send(new DataChannel.Buffer(ByteBuffer.wrap(Data.newBuilder().setConnected(Connected.newBuilder().setId(this.callId)).build().toByteArray()), false));
intent.putExtra(EXTRA_CALL_ID, callId);
intent.putExtra(EXTRA_REMOTE_RECIPIENT, recipient.getId());
handleCallConnected(intent);
activateCallMedia();
}
private void handleDenyCall(Intent intent) {