refactored avatar generation. first step

4 files changed, 27 insertions, 13 deletions

diff --git a/src/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index 5c25bf346..402299534 100644
--- a/src/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -34,7 +34,8 @@ public class AccountAdapter extends ArrayAdapter<Account> {
 		jid.setText(account.getJid());
 		TextView statusView = (TextView) view.findViewById(R.id.account_status);
 		ImageView imageView = (ImageView) view.findViewById(R.id.account_image);
-		imageView.setImageBitmap(account.getImage(activity, 48));
+		imageView.setImageBitmap(activity.xmppConnectionService
+				.getAvatarService().getAvatar(account, activity.getPixel(48)));
 		switch (account.getStatus()) {
 		case Account.STATUS_DISABLED:
 			statusView.setText(getContext().getString(
diff --git a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 20c7bee21..1fea8dcf8 100644
--- a/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -127,7 +127,9 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 
 		ImageView profilePicture = (ImageView) view
 				.findViewById(R.id.conversation_image);
-		profilePicture.setImageBitmap(conversation.getImage(activity, 56));
+		profilePicture.setImageBitmap(activity.xmppConnectionService
+				.getAvatarService().getAvatar(conversation,
+						activity.getPixel(56)));
 
 		return view;
 	}
diff --git a/src/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
index df67e5663..64e077a37 100644
--- a/src/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
+++ b/src/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
@@ -4,6 +4,7 @@ import java.util.List;
 
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.ListItem;
+import eu.siacs.conversations.ui.XmppActivity;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,8 +15,11 @@ import android.widget.TextView;
 
 public class ListItemAdapter extends ArrayAdapter<ListItem> {
 
-	public ListItemAdapter(Context context, List<ListItem> objects) {
-		super(context, 0, objects);
+	protected XmppActivity activity;
+
+	public ListItemAdapter(XmppActivity activity, List<ListItem> objects) {
+		super(activity, 0, objects);
+		this.activity = activity;
 	}
 
 	@Override
@@ -32,7 +36,8 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 
 		jid.setText(item.getJid());
 		name.setText(item.getDisplayName());
-		picture.setImageBitmap(item.getImage(48, getContext()));
+		picture.setImageBitmap(activity.xmppConnectionService
+				.getAvatarService().getAvatar(item, activity.getPixel(48)));
 		return view;
 	}
 
diff --git a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index db783b7f6..bc5b33877 100644
--- a/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -59,8 +59,10 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		if (this.accountBitmap == null) {
 
 			if (getCount() > 0) {
-				this.accountBitmap = getItem(0).getConversation().getAccount()
-						.getImage(getContext(), 48);
+				this.accountBitmap = activity.xmppConnectionService
+						.getAvatarService().getAvatar(
+								getItem(0).getConversation().getAccount(),
+								activity.getPixel(48));
 			}
 		}
 		return this.accountBitmap;
@@ -494,9 +496,12 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					&& d.getStatus() == Downloadable.STATUS_DELETED) {
 				displayInfoMessage(viewHolder, R.string.image_file_deleted);
 			} else if (d != null && d.getStatus() == Downloadable.STATUS_OFFER) {
-				displayDownloadableMessage(viewHolder, item,R.string.download_image);
-			} else if (d != null && d.getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE) {
-				displayDownloadableMessage(viewHolder, item,R.string.check_image_filesize);
+				displayDownloadableMessage(viewHolder, item,
+						R.string.download_image);
+			} else if (d != null
+					&& d.getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE) {
+				displayDownloadableMessage(viewHolder, item,
+						R.string.check_image_filesize);
 			} else if ((item.getEncryption() == Message.ENCRYPTION_DECRYPTED)
 					|| (item.getEncryption() == Message.ENCRYPTION_NONE)
 					|| (item.getEncryption() == Message.ENCRYPTION_OTR)) {
@@ -564,7 +569,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		public Bitmap get(Contact contact, Context context) {
 			if (!contactBitmaps.containsKey(contact.getJid())) {
 				contactBitmaps.put(contact.getJid(),
-						contact.getImage(48, context));
+						activity.xmppConnectionService.getAvatarService()
+								.getAvatar(contact, activity.getPixel(48)));
 			}
 			return contactBitmaps.get(contact.getJid());
 		}
@@ -573,8 +579,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			if (unknownBitmaps.containsKey(name)) {
 				return unknownBitmaps.get(name);
 			} else {
-				Bitmap bm = UIHelper
-						.getContactPicture(name, 48, context, false);
+				Bitmap bm = activity.xmppConnectionService.getAvatarService()
+						.getAvatar(name, activity.getPixel(48));
 				unknownBitmaps.put(name, bm);
 				return bm;
 			}