From 182c758d35e7d4723c6c697ce5cd4b697e0054cd Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 9 Aug 2021 11:52:38 -0400
Subject: [PATCH] Revert "Fix NPE when operating on multiple conversations in
 batch mode."

This reverts commit fc51c4940c9418d40f209eebe95063f0c33d2e08.
---
 .../securesms/conversationlist/ConversationListAdapter.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 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 9f2b7a420..2644fa769 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -20,7 +20,6 @@ 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;
@@ -211,7 +210,7 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
   }
 
   Collection<Conversation> getBatchSelection() {
-    return new ArrayList<>(batchSet.values());
+    return batchSet.values();
   }
 
   @Override
@@ -234,7 +233,7 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
   }
 
   @NonNull Set<Long> getBatchSelectionIds() {
-    return new HashSet<>(batchSet.keySet());
+    return batchSet.keySet();
   }
 
   void selectAllThreads() {