From 6031af86062757f86701e08962aa86121877fbf4 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 14 Jul 2014 17:13:59 +0200 Subject: use proper picture on bookmarked conferences when joined. use bookmark title when no subject is set --- src/eu/siacs/conversations/ui/StartConversation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/eu/siacs/conversations/ui/StartConversation.java') diff --git a/src/eu/siacs/conversations/ui/StartConversation.java b/src/eu/siacs/conversations/ui/StartConversation.java index 99b3385c..e1186858 100644 --- a/src/eu/siacs/conversations/ui/StartConversation.java +++ b/src/eu/siacs/conversations/ui/StartConversation.java @@ -221,6 +221,7 @@ public class StartConversation extends XmppActivity { protected void openConversationForBookmark(int position) { Bookmark bookmark = (Bookmark) conferences.get(position); Conversation conversation = xmppConnectionService.findOrCreateConversation(bookmark.getAccount(), bookmark.getJid(), true); + conversation.setBookmark(bookmark); switchToConversation(conversation); } @@ -445,8 +446,7 @@ public class StartConversation extends XmppActivity { jid.setText(item.getJid()); name.setText(item.getDisplayName()); - picture.setImageBitmap(UIHelper.getContactPicture(item, 48, - this.getContext(), false)); + picture.setImageBitmap(item.getImage(48, getApplicationContext())); return view; } -- cgit v1.2.3