aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/ui
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-07-14 17:13:59 +0200
committeriNPUTmice <daniel@gultsch.de>2014-07-14 17:13:59 +0200
commit6031af86062757f86701e08962aa86121877fbf4 (patch)
tree9bb335d4e5f92493ddb16f80ae01f577aa4b991f /src/eu/siacs/conversations/ui
parent3fa3d5f02ba954d87179c64cd75bd2ae7a749770 (diff)
use proper picture on bookmarked conferences when joined. use bookmark title when no subject is set
Diffstat (limited to 'src/eu/siacs/conversations/ui')
-rw-r--r--src/eu/siacs/conversations/ui/StartConversation.java4
1 files changed, 2 insertions, 2 deletions
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;
}