From 88d1bd356c9408df6f12829dcd427b92af1e3969 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 31 Jul 2014 15:18:55 +0200 Subject: [PATCH] get rid of 'use phones self contact picture option' --- res/xml/preferences.xml | 5 ----- .../ui/adapter/MessageAdapter.java | 18 +++++------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 40039cd5c..b64a477d2 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -62,11 +62,6 @@ - { private ConversationActivity activity; - private Bitmap selfBitmap2; + private Bitmap accountBitmap; private BitmapCache mBitmapCache = new BitmapCache(); private DisplayMetrics metrics; @@ -51,20 +49,14 @@ public class MessageAdapter extends ArrayAdapter { } private Bitmap getSelfBitmap() { - if (this.selfBitmap2 == null) { + if (this.accountBitmap == null) { if (getCount() > 0) { - SharedPreferences preferences = PreferenceManager - .getDefaultSharedPreferences(getContext()); - boolean showPhoneSelfContactPicture = preferences.getBoolean( - "show_phone_selfcontact_picture", true); - - this.selfBitmap2 = UIHelper.getSelfContactPicture(getItem(0) - .getConversation().getAccount(), 48, - showPhoneSelfContactPicture, getContext()); + this.accountBitmap = getItem(0) + .getConversation().getAccount().getImage(getContext(), 48); } } - return this.selfBitmap2; + return this.accountBitmap; } public void setOnContactPictureClicked(OnContactPictureClicked listener) {