From 5de50f1a8ba2556377e498d1956c78e0cae01c11 Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 7 Dec 2020 14:11:35 -0400
Subject: [PATCH] Fix overflow presentation when active speaker changes.

---
 .../securesms/components/webrtc/CallParticipantsState.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java
index a23bc0fdcd..4911de49fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/webrtc/CallParticipantsState.java
@@ -87,7 +87,8 @@ public final class CallParticipantsState {
     List<CallParticipant> listParticipants = new ArrayList<>();
 
     if (isViewingFocusedParticipant && getAllRemoteParticipants().size() > 1) {
-      listParticipants.addAll(getAllRemoteParticipants().subList(1, getAllRemoteParticipants().size()));
+      listParticipants.addAll(getAllRemoteParticipants());
+      listParticipants.remove(focusedParticipant);
     } else if (getAllRemoteParticipants().size() > SMALL_GROUP_MAX) {
       listParticipants.addAll(getAllRemoteParticipants().subList(SMALL_GROUP_MAX, getAllRemoteParticipants().size()));
     } else {