From 1fb0573fecbab419da16905bad68f12b7ef931de Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 5 Nov 2021 16:30:52 -0400
Subject: [PATCH] Fix conversation list multiselect animation.

---
 .../securesms/conversationlist/ConversationListAdapter.java   | 1 -
 .../securesms/conversationlist/ConversationListItem.java      | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

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 908833e2e6..67b9b36697 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
@@ -231,7 +231,6 @@ class ConversationListAdapter extends ListAdapter<Conversation, RecyclerView.Vie
   void initializeBatchMode(boolean toggle) {
     this.batchMode = toggle;
     batchSet.clear();
-    notifyDataSetChanged();
   }
 
   static final class ConversationViewHolder extends RecyclerView.ViewHolder {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
index 3dc4b3f8ed..3a673bcdfe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
@@ -295,6 +295,10 @@ public final class ConversationListItem extends ConstraintLayout
     boolean selected = batchMode && selectedThreads.contains(thread.getThreadId());
     setSelected(selected);
 
+    if (recipient != null) {
+      contactPhotoImage.setAvatar(glideRequests, recipient.get(), !batchMode);
+    }
+    
     if (batchMode && selected) {
       checkContainer.setVisibility(VISIBLE);
       uncheckedView.setVisibility(GONE);