From ec4fdfa7d3b95003f27cae2ef8de54ab415abb9a Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 22 Jan 2025 11:15:58 -0400
Subject: [PATCH] Prevent controls from appearing when a call glare occurs.

---
 .../components/webrtc/controls/ControlsAndInfoController.kt   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt
index c0b24effae..847e62fc7f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/controls/ControlsAndInfoController.kt
@@ -284,7 +284,7 @@ class ControlsAndInfoController private constructor(
 
   private fun hide(delay: Long = 0L) {
     if (delay == 0L) {
-      if (controlState.isFadeOutEnabled || controlState == WebRtcControls.PIP || controlState.displayErrorControls()) {
+      if (controlState.isFadeOutEnabled || controlState == WebRtcControls.PIP || controlState.displayErrorControls() || controlState.displayIncomingCallButtons()) {
         behavior.isHideable = true
         behavior.state = BottomSheetBehavior.STATE_HIDDEN
 
@@ -343,7 +343,7 @@ class ControlsAndInfoController private constructor(
   }
 
   private fun showOrHideControlsOnUpdate(previousState: WebRtcControls) {
-    if (controlState == WebRtcControls.PIP || controlState.displayErrorControls()) {
+    if (controlState == WebRtcControls.PIP || controlState.displayErrorControls() || controlState.displayIncomingCallButtons()) {
       hide()
       return
     }