From 322c139c26ab70a57feba9b5dcdd93c89ea9b5af Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Tue, 13 Oct 2020 14:53:12 -0400
Subject: [PATCH] Fix bug of video showing on next call after cancel pre-join.

Fixes #10083
---
 .../securesms/service/WebRtcCallService.java          |  5 ++++-
 app/src/main/res/layout/webrtc_call_view_toolbar.xml  | 11 +++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
index 94b0f826aa..877e272514 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/WebRtcCallService.java
@@ -506,7 +506,10 @@ public class WebRtcCallService extends Service implements CallManager.Observer,
 
   private void handleCancelPreJoinCall() {
     cleanupVideo();
-    preJoinPeer = null;
+    enableVideoOnCreate = false;
+    preJoinPeer         = null;
+
+    EventBus.getDefault().removeStickyEvent(WebRtcViewModel.class);
   }
 
   private void handleOutgoingCall(Intent intent) {
diff --git a/app/src/main/res/layout/webrtc_call_view_toolbar.xml b/app/src/main/res/layout/webrtc_call_view_toolbar.xml
index e548d584b3..17ea9de92d 100644
--- a/app/src/main/res/layout/webrtc_call_view_toolbar.xml
+++ b/app/src/main/res/layout/webrtc_call_view_toolbar.xml
@@ -3,10 +3,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    app:contentInsetStart="0dp">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal">
 
@@ -19,8 +20,9 @@
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
             android:id="@+id/call_screen_recipient_name"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
             android:textAppearance="@style/TextAppearance.Signal.Body1.Bold"
             android:textColor="@color/core_white"
             app:layout_constraintBottom_toTopOf="@id/action_bar_guideline"
@@ -31,8 +33,9 @@
 
         <TextView
             android:id="@+id/call_screen_status"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="center_horizontal"
             android:textAppearance="@style/TextAppearance.Signal.Subtitle"
             android:textColor="@color/core_white"
             app:layout_constraintBottom_toBottomOf="parent"