From 5ed9c2a8056a017a2ad401e282d4fb6ac9fb5428 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 11 Aug 2014 23:22:46 +0200 Subject: show own avatar in muc details --- src/eu/siacs/conversations/entities/Account.java | 2 +- src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/eu/siacs') diff --git a/src/eu/siacs/conversations/entities/Account.java b/src/eu/siacs/conversations/entities/Account.java index a35acb8a..b734c6ee 100644 --- a/src/eu/siacs/conversations/entities/Account.java +++ b/src/eu/siacs/conversations/entities/Account.java @@ -326,7 +326,7 @@ public class Account extends AbstractEntity{ public Bitmap getImage(Context context, int size) { if (this.avatar!=null) { - Bitmap bm = BitmapFactory.decodeFile(FileBackend.getAvatarPath(context, avatar)); + Bitmap bm = FileBackend.getAvatar(this.avatar, size, context); if (bm==null) { return UIHelper.getContactPicture(getJid(), size, context, false); } else { diff --git a/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index c22dd26f..b037b8bc 100644 --- a/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -199,8 +199,7 @@ public class ConferenceDetailsActivity extends XmppActivity { } private void populateView() { - mYourPhoto.setImageBitmap(UIHelper.getContactPicture(conversation - .getMucOptions().getActualNick(), 48, this, false)); + mYourPhoto.setImageBitmap(conversation.getAccount().getImage(this, 48)); setTitle(conversation.getName(true)); mFullJid.setText(conversation.getContactJid().split("/")[0]); mYourNick.setText(conversation.getMucOptions().getActualNick()); -- cgit v1.2.3