Commit b506b8ca authored by Francisco Cunha's avatar Francisco Cunha

P4A-1020 - Merge fix

parent f4139ff8
...@@ -177,7 +177,10 @@ class MessageViewHolder internal constructor(private val fragment: MessageListFr ...@@ -177,7 +177,10 @@ class MessageViewHolder internal constructor(private val fragment: MessageListFr
} else if (counterpartyAddress != null) { } else if (counterpartyAddress != null) {
Utility.setContactForBadge(contactBadge, counterpartyAddress) Utility.setContactForBadge(contactBadge, counterpartyAddress)
// contactBadge.setPadding(0, 0, 0, 0); // contactBadge.setPadding(0, 0, 0, 0);
fragment.contactsPictureLoader.loadContactPicture(counterpartyAddress, contactBadge) // contactBadge.setPadding(0, 0, 0, 0);
contactBadge?.let {
fragment.contactsPictureLoader.setContactPicture(it, counterpartyAddress)
}
} else { } else {
contactBadge?.assignContactUri(null) contactBadge?.assignContactUri(null)
contactBadge?.setImageResource(R.drawable.ic_contact_picture) contactBadge?.setImageResource(R.drawable.ic_contact_picture)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment