From 90ff3d1e32eef6a286397a81b893113ed2d7a60d Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 1 Nov 2024 16:35:16 -0300
Subject: [PATCH] Fix state restore after activity swipe and launch from
 notification.

---
 .../webrtc/CallParticipantsListUpdatePopupWindow.java           | 2 +-
 .../securesms/components/webrtc/WebRtcCallViewModel.java        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java
index 3b444c7520..7de071b070 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsListUpdatePopupWindow.java
@@ -108,7 +108,7 @@ public class CallParticipantsListUpdatePopupWindow extends PopupWindow implement
   }
 
   private void show() {
-    if (!isEnabled) {
+    if (!isEnabled || !parent.isAttachedToWindow()) {
       return;
     }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java
index 2ed97cc02c..8800d11d15 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/WebRtcCallViewModel.java
@@ -17,7 +17,6 @@ import androidx.lifecycle.ViewModel;
 import com.annimon.stream.Stream;
 
 import org.signal.core.util.ThreadUtil;
-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.components.webrtc.v2.CallControlsState;
 import org.thoughtcrime.securesms.components.webrtc.v2.CallEvent;
 import org.thoughtcrime.securesms.database.GroupTable;