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

Fix race condition that would display end call button over answer

Browse source 
Fixes #7211
This commit is contained in:
Moxie Marlinspike 2017-11-20 11:17:36 -08:00
parent efb9ba6496
commit c1b2098bd9
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
View file

@ -104,12 +104,14 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientModifiedLi
setConnected(WebRtcCallService.localRenderer, WebRtcCallService.remoteRenderer);
incomingCallButton.stopRingingAnimation();
incomingCallButton.setVisibility(View.GONE);
endCallButton.show();
}
public void setActiveCall(@NonNull Recipient personInfo, @NonNull String message) {
setCard(personInfo, message);
incomingCallButton.stopRingingAnimation();
incomingCallButton.setVisibility(View.GONE);
endCallButton.show();
}
public void setIncomingCall(Recipient personInfo) {
@ -296,7 +298,6 @@ public class WebRtcCallScreen extends FrameLayout implements RecipientModifiedLi
setPersonInfo(recipient);
this.status.setText(status);
this.untrustedIdentityContainer.setVisibility(View.GONE);
this.endCallButton.show();
}
private void setMinimized(boolean minimized) {