From fc51c4940c9418d40f209eebe95063f0c33d2e08 Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Fri, 6 Aug 2021 11:14:33 -0400
Subject: [PATCH] Fix NPE when operating on multiple conversations in batch
 mode.

---
 .../securesms/conversationlist/ConversationListAdapter.java  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
index 2644fa769..9f2b7a420 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.CachedInflater;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -210,7 +211,7 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
   }
 
   Collection<Conversation> getBatchSelection() {
-    return batchSet.values();
+    return new ArrayList<>(batchSet.values());
   }
 
   @Override
@@ -233,7 +234,7 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
   }
 
   @NonNull Set<Long> getBatchSelectionIds() {
-    return batchSet.keySet();
+    return new HashSet<>(batchSet.keySet());
   }
 
   void selectAllThreads() {