TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 08:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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); 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) {