From c1b2098bd939e5ef0ee13457b2bb0157b6e39529 Mon Sep 17 00:00:00 2001
From: Moxie Marlinspike <moxie@thoughtcrime.org>
Date: Mon, 20 Nov 2017 11:17:36 -0800
Subject: [PATCH] Fix race condition that would display end call button over
 answer

Fixes #7211
---
 .../securesms/components/webrtc/WebRtcCallScreen.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
index b463bc6bd..ed505f497 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
@@ -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) {