Fix race condition that would display end call button over answer

Fixes #7211
pull/1/head
Moxie Marlinspike 8 years ago
parent efb9ba6496
commit c1b2098bd9

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

Loading…
Cancel
Save