From 5769287c77b7175e10ce40cfeadf060176c6180e Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Tue, 21 Jan 2025 15:19:14 -0400
Subject: [PATCH] Do not display incoming call in PiP.

---
 .../java/org/thoughtcrime/securesms/WebRtcCallActivity.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
index 5ecb224bdd..8483113cfa 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -320,7 +320,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
 
     if (!callPermissionsDialogController.isAskingForPermission() && !viewModel.isCallStarting() && !isChangingConfigurations()) {
       CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
-      if (state != null && state.getCallState().isPreJoinOrNetworkUnavailable()) {
+      if (state != null && (state.getCallState().isPreJoinOrNetworkUnavailable() || state.getCallState().isIncomingOrHandledElsewhere())) {
         finish();
       }
     }
@@ -343,7 +343,7 @@ public class WebRtcCallActivity extends BaseActivity implements SafetyNumberChan
     if (!viewModel.isCallStarting() && !isChangingConfigurations()) {
       CallParticipantsState state = viewModel.getCallParticipantsStateSnapshot();
       if (state != null) {
-        if (state.getCallState().isPreJoinOrNetworkUnavailable()) {
+        if (state.getCallState().isPreJoinOrNetworkUnavailable() || state.getCallState().isIncomingOrHandledElsewhere()) {
           AppDependencies.getSignalCallManager().cancelPreJoin();
         } else if (state.getCallState().getInOngoingCall() && isInPipMode()) {
           AppDependencies.getSignalCallManager().relaunchPipOnForeground();