moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix bug introduced by rebase

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) {
viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(contact, activity.getPixel(48)));
} else if (item.getConversation().getMode() == Conversation.MODE_MULTI) {
String name = item.getPresence();
if (name == null) {
name = item.getCounterpart();
}
viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(name, activity.getPixel(48)));
final Jid name = item.getPresence() != null ? item.getPresence() : item.getCounterpart();
viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(
name.isBareJid() ? name.toString() : name.getResourcepart(),
activity.getPixel(48)));
}
} else if (type == SENT) {
viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(item.getConversation().getAccount(), activity.getPixel(48)));