diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-08-11 23:22:46 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-08-11 23:22:46 +0200 |
| commit | 5ed9c2a8056a017a2ad401e282d4fb6ac9fb5428 (patch) | |
| tree | 069f9471db57bdd0a5c2d474788791e656453f91 | |
| parent | 8a82586d5bfbdfa5fdefe0bf1b0538a405a0f871 (diff) | |
show own avatar in muc details
| -rw-r--r-- | src/eu/siacs/conversations/entities/Account.java | 2 | ||||
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 3 |
2 files changed, 2 insertions, 3 deletions
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()); |