mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-02-28 13:48:12 +00:00
Fix issue with CIV2 where avatars would not load.
This commit is contained in:
committed by
Cody Henthorne
parent
ea5c3a7c5e
commit
32ae4393e2
@@ -59,7 +59,7 @@ import java.util.Optional
|
||||
|
||||
class ConversationAdapterV2(
|
||||
private val lifecycleOwner: LifecycleOwner,
|
||||
private val glideRequests: GlideRequests,
|
||||
override val glideRequests: GlideRequests,
|
||||
override val clickListener: ItemClickListener,
|
||||
private var hasWallpaper: Boolean,
|
||||
private val colorizer: Colorizer,
|
||||
|
||||
@@ -10,12 +10,14 @@ import org.thoughtcrime.securesms.conversation.ConversationItemDisplayMode
|
||||
import org.thoughtcrime.securesms.conversation.colors.Colorizer
|
||||
import org.thoughtcrime.securesms.conversation.mutiselect.MultiselectPart
|
||||
import org.thoughtcrime.securesms.database.model.MessageRecord
|
||||
import org.thoughtcrime.securesms.mms.GlideRequests
|
||||
|
||||
/**
|
||||
* Describes the Adapter "context" that would normally have been
|
||||
* visible to an inner class.
|
||||
*/
|
||||
interface V2ConversationContext {
|
||||
val glideRequests: GlideRequests
|
||||
val displayMode: ConversationItemDisplayMode
|
||||
val clickListener: ConversationAdapter.ItemClickListener
|
||||
val selectedItems: Set<MultiselectPart>
|
||||
|
||||
@@ -417,8 +417,8 @@ class V2TextOnlyViewHolder<Model : MappingModel<Model>>(
|
||||
|
||||
binding.senderName.text = sender.getDisplayName(context)
|
||||
binding.senderName.setTextColor(conversationContext.getColorizer().getIncomingGroupSenderColor(context, sender))
|
||||
binding.senderPhoto.setAvatar(sender)
|
||||
binding.senderBadge.setBadgeFromRecipient(sender)
|
||||
binding.senderPhoto.setAvatar(conversationContext.glideRequests, sender, false)
|
||||
binding.senderBadge.setBadgeFromRecipient(sender, conversationContext.glideRequests)
|
||||
} else {
|
||||
binding.senderName.visible = false
|
||||
binding.senderPhoto.visible = false
|
||||
|
||||
Reference in New Issue
Block a user