Revert "Fix NPE when operating on multiple conversations in batch mode."
This reverts commit fc51c4940c
.
This commit is contained in:
parent
f6b2d3faf8
commit
182c758d35
1 changed files with 2 additions and 3 deletions
|
@ -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() {
|
||||
|
|
Loading…
Add table
Reference in a new issue