narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Fix bug introduced by rebase

Browse source
This commit is contained in:
Sam Whited 2014-11-07 17:48:30 -05:00
parent 778fb9de6c
commit e49c2b14ed
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -417,11 +417,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
if (contact != null) { if (contact != null) {
viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(contact, activity.getPixel(48))); viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(contact, activity.getPixel(48)));
} else if (item.getConversation().getMode() == Conversation.MODE_MULTI) { } else if (item.getConversation().getMode() == Conversation.MODE_MULTI) {
String name = item.getPresence(); final Jid name = item.getPresence() != null ? item.getPresence() : item.getCounterpart();
if (name == null) { viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(
name = item.getCounterpart(); name.isBareJid() ? name.toString() : name.getResourcepart(),
} activity.getPixel(48)));
viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(name, activity.getPixel(48)));
} }
} else if (type == SENT) { } else if (type == SENT) {
viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(item.getConversation().getAccount(), activity.getPixel(48))); viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(item.getConversation().getAccount(), activity.getPixel(48)));