1 files changed, 18 insertions, 22 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java b/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
index 7321fc08..83aa83e3 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
@@ -17,6 +17,8 @@ import de.thedevstack.conversationsplus.entities.Contact;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.ListItem;
 import de.thedevstack.conversationsplus.entities.MucOptions;
+import de.thedevstack.conversationsplus.utils.AvatarUtil;
+import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.UIHelper;
 
 public class AvatarService {
@@ -40,28 +42,27 @@ public class AvatarService {
 
 	private Bitmap get(final Contact contact, final int size, boolean cachedOnly) {
 		final String KEY = key(contact, size);
-		Bitmap avatar = this.mXmppConnectionService.getBitmapCache().get(KEY);
+		Bitmap avatar = ImageUtil.getBitmapFromCache(KEY);
 		if (avatar != null || cachedOnly) {
 			return avatar;
 		}
 		if (contact.getProfilePhoto() != null) {
-			avatar = mXmppConnectionService.getFileBackend().cropCenterSquare(Uri.parse(contact.getProfilePhoto()), size);
+			avatar = ImageUtil.cropCenterSquare(Uri.parse(contact.getProfilePhoto()), size);
 		}
 		if (avatar == null && contact.getAvatar() != null) {
-			avatar = mXmppConnectionService.getFileBackend().getAvatar(contact.getAvatar(), size);
+			avatar = AvatarUtil.getAvatar(contact.getAvatar(), size);
 		}
 		if (avatar == null) {
             avatar = get(contact.getDisplayName(), size, cachedOnly);
 		}
-		this.mXmppConnectionService.getBitmapCache().put(KEY, avatar);
+		ImageUtil.addBitmapToCache(KEY, avatar);
 		return avatar;
 	}
 
 	public void clear(Contact contact) {
 		synchronized (this.sizes) {
 			for (Integer size : sizes) {
-				this.mXmppConnectionService.getBitmapCache().remove(
-						key(contact, size));
+				ImageUtil.removeBitmapFromCache(key(contact, size));
 			}
 		}
 	}
@@ -117,7 +118,7 @@ public class AvatarService {
 
 	private Bitmap get(MucOptions mucOptions, int size,  boolean cachedOnly) {
 		final String KEY = key(mucOptions, size);
-		Bitmap bitmap = this.mXmppConnectionService.getBitmapCache().get(KEY);
+		Bitmap bitmap = ImageUtil.getBitmapFromCache(KEY);
 		if (bitmap != null || cachedOnly) {
 			return bitmap;
 		}
@@ -155,15 +156,14 @@ public class AvatarService {
 			drawTile(canvas, "\u2026", PLACEHOLDER_COLOR, size / 2 + 1, size / 2 + 1,
 					size, size);
 		}
-		this.mXmppConnectionService.getBitmapCache().put(KEY, bitmap);
+		ImageUtil.addBitmapToCache(KEY, bitmap);
 		return bitmap;
 	}
 
 	public void clear(MucOptions options) {
 		synchronized (this.sizes) {
 			for (Integer size : sizes) {
-				this.mXmppConnectionService.getBitmapCache().remove(
-						key(options, size));
+				ImageUtil.removeBitmapFromCache(key(options, size));
 			}
 		}
 	}
@@ -180,24 +180,22 @@ public class AvatarService {
 
 	public Bitmap get(Account account, int size) {
 		final String KEY = key(account, size);
-		Bitmap avatar = mXmppConnectionService.getBitmapCache().get(KEY);
+		Bitmap avatar = ImageUtil.getBitmapFromCache(KEY);
 		if (avatar != null) {
 			return avatar;
 		}
-		avatar = mXmppConnectionService.getFileBackend().getAvatar(
-				account.getAvatar(), size);
+		avatar = AvatarUtil.getAvatar(account.getAvatar(), size);
 		if (avatar == null) {
 			avatar = get(account.getJid().toBareJid().toString(), size,false);
 		}
-		mXmppConnectionService.getBitmapCache().put(KEY, avatar);
+		ImageUtil.addBitmapToCache(KEY, avatar);
 		return avatar;
 	}
 
 	public void clear(Account account) {
 		synchronized (this.sizes) {
 			for (Integer size : sizes) {
-				this.mXmppConnectionService.getBitmapCache().remove(
-						key(account, size));
+				ImageUtil.removeBitmapFromCache(key(account, size));
 			}
 		}
 	}
@@ -218,7 +216,7 @@ public class AvatarService {
 
 	public Bitmap get(final String name, final int size, boolean cachedOnly) {
 		final String KEY = key(name, size);
-		Bitmap bitmap = mXmppConnectionService.getBitmapCache().get(KEY);
+		Bitmap bitmap = ImageUtil.getBitmapFromCache(KEY);
 		if (bitmap != null || cachedOnly) {
 			return bitmap;
 		}
@@ -228,7 +226,7 @@ public class AvatarService {
 		final String letter = trimmedName.isEmpty() ? "X" : trimmedName.substring(0,1);
 		final int color = UIHelper.getColorForName(name);
 		drawTile(canvas, letter, color, 0, 0, size, size);
-		mXmppConnectionService.getBitmapCache().put(KEY, bitmap);
+		ImageUtil.addBitmapToCache(KEY, bitmap);
 		return bitmap;
 	}
 
@@ -268,12 +266,10 @@ public class AvatarService {
 			if (contact.getProfilePhoto() != null) {
 				uri = Uri.parse(contact.getProfilePhoto());
 			} else if (contact.getAvatar() != null) {
-				uri = mXmppConnectionService.getFileBackend().getAvatarUri(
-						contact.getAvatar());
+				uri = AvatarUtil.getAvatarUri(contact.getAvatar());
 			}
 			if (uri != null) {
-				Bitmap bitmap = mXmppConnectionService.getFileBackend()
-						.cropCenter(uri, bottom - top, right - left);
+				Bitmap bitmap = ImageUtil.cropCenter(uri, bottom - top, right - left);
 				if (bitmap != null) {
 					drawTile(canvas, bitmap, left, top, right, bottom);
 					return;