From 911d7f3be8c46e79ba44ab740263f5c9585af155 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Wed, 25 Feb 2026 10:17:18 -0400
Subject: [PATCH] Fix crash occurring when user rapidly enters and leaves a
 call.

Co-authored-by: Greyson Parrelli <greyson@signal.org>
---
 .../securesms/components/webrtc/v2/CallGrid.kt             | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallGrid.kt b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallGrid.kt
index ec318545eb..7dd32e33aa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallGrid.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/v2/CallGrid.kt
@@ -530,6 +530,9 @@ fun <T> CallGrid(
   val hasExistingItems = knownKeys.isNotEmpty()
 
   newKeys.forEach { key ->
+    if (exitingItems.any { it.key == key }) {
+      exitingItems = exitingItems.filterNot { it.key == key }
+    }
     if (hasExistingItems) {
       alphaAnimatables[key] = Animatable(0f)
       scaleAnimatables[key] = Animatable(CallGridDefaults.ENTER_SCALE_START)
@@ -569,7 +572,9 @@ fun <T> CallGrid(
           launch { scaleAnimatables[key]?.animateTo(CallGridDefaults.EXIT_SCALE_END, CallGridDefaults.scaleAnimationSpec) }
         }
         exitingItems = exitingItems.filterNot { it.key == key }
-        removeAnimationState(key)
+        if (key !in knownKeys) {
+          removeAnimationState(key)
+        }
       }
     } else {
       removeAnimationState(key)