empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Run local hangup events through view model

Browse source 
Fixes #6143
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-02-02 18:53:45 -08:00
parent 9a93a8b28d
commit 7d644ae9c6
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/org/thoughtcrime/securesms/WebRtcCallActivity.java
View file

@ -181,11 +181,11 @@ public class WebRtcCallActivity extends Activity {
intent.setAction(WebRtcCallService.ACTION_LOCAL_HANGUP); intent.setAction(WebRtcCallService.ACTION_LOCAL_HANGUP);
startService(intent); startService(intent);
WebRtcViewModel event = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class); // WebRtcViewModel event = EventBus.getDefault().getStickyEvent(WebRtcViewModel.class);
//
if (event != null) { // if (event != null) {
WebRtcCallActivity.this.handleTerminate(event.getRecipient()); // WebRtcCallActivity.this.handleTerminate(event.getRecipient());
} // }
} }
private void handleIncomingCall(@NonNull WebRtcViewModel event) { private void handleIncomingCall(@NonNull WebRtcViewModel event) {

1
src/org/thoughtcrime/securesms/service/WebRtcCallService.java
View file

@ -569,6 +569,7 @@ public class WebRtcCallService extends Service implements InjectableType, CallSt
this.dataChannel.send(new DataChannel.Buffer(ByteBuffer.wrap(Data.newBuilder().setHangup(Hangup.newBuilder().setId(this.callId)).build().toByteArray()), false)); this.dataChannel.send(new DataChannel.Buffer(ByteBuffer.wrap(Data.newBuilder().setHangup(Hangup.newBuilder().setId(this.callId)).build().toByteArray()), false));
sendMessage(this.recipient, SignalServiceCallMessage.forHangup(new HangupMessage(this.callId))); sendMessage(this.recipient, SignalServiceCallMessage.forHangup(new HangupMessage(this.callId)));
sendMessage(WebRtcViewModel.State.CALL_DISCONNECTED, this.recipient, localVideoEnabled, remoteVideoEnabled);
} }
terminate(); terminate();