diff options
author | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-12 10:22:18 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel.gultsch@rwth-aachen.de> | 2014-04-12 10:22:18 +0200 |
commit | f57b669f83c384f1245842c4b89525c7c43d6ec9 (patch) | |
tree | 3cd20e3d8cf6d97d9f5538a652503fbe9fb761ba /src/eu/siacs/conversations/ui/ConversationFragment.java | |
parent | d936a830e4866f070ba7726ecb845cc66644a238 (diff) | |
parent | f3b07250ddabb612e9cd9fc7985c7d97a9b844d8 (diff) |
Merge branch 'development' of https://github.com/strb/Conversations into strb-development
Diffstat (limited to 'src/eu/siacs/conversations/ui/ConversationFragment.java')
-rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 04fb6f92..3796f83e 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -614,7 +614,12 @@ public class ConversationFragment extends Fragment { if (bitmaps.containsKey(name)) { return bitmaps.get(name); } else { - Bitmap bm = UIHelper.getContactPicture(contact, name, 200, context); + Bitmap bm; + if (contact != null){ + bm = UIHelper.getContactPicture(contact, 200, context); + } else { + bm = UIHelper.getContactPicture(name, 200, context); + } bitmaps.put(name, bm); return bm; } |