Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 12:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE when operating on multiple conversations in batch mode.

Browse Source
This commit is contained in:
Cody Henthorne
2021-08-06 11:14:33 -04:00
parent b9ffbb8e92
commit fc51c4940c
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
View File

@@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.util.CachedInflater; import org.thoughtcrime.securesms.util.CachedInflater;
import org.thoughtcrime.securesms.util.ViewUtil; import org.thoughtcrime.securesms.util.ViewUtil;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
@@ -210,7 +211,7 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
} }
Collection<Conversation> getBatchSelection() { Collection<Conversation> getBatchSelection() {
return batchSet.values(); return new ArrayList<>(batchSet.values());
} }
@Override @Override
@@ -233,7 +234,7 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
} }
@NonNull Set<Long> getBatchSelectionIds() { @NonNull Set<Long> getBatchSelectionIds() {
return batchSet.keySet(); return new HashSet<>(batchSet.keySet());
} }
void selectAllThreads() { void selectAllThreads() {