1 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 1308f32b..2a128d24 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -88,12 +88,12 @@ public class AvatarService {
 
 	private Bitmap getImpl(final MucOptions.User user, final int size, boolean cachedOnly) {
 		final String KEY = key(user, size);
-		Bitmap avatar = this.mXmppConnectionService.getBitmapCache().get(KEY);
+		Bitmap avatar = ImageUtil.getBitmapFromCache(KEY);
 		if (avatar != null || cachedOnly) {
 			return avatar;
 		}
 		if (user.getAvatar() != null) {
-			avatar = mXmppConnectionService.getFileBackend().getAvatar(user.getAvatar(), size);
+			avatar = AvatarUtil.getAvatar(user.getAvatar(), size);
 		}
 		if (avatar == null) {
 			Contact contact = user.getContact();
@@ -103,7 +103,7 @@ public class AvatarService {
 				avatar = get(user.getName(), size, cachedOnly);
 			}
 		}
-		this.mXmppConnectionService.getBitmapCache().put(KEY, avatar);
+		ImageUtil.addBitmapToCache(KEY, avatar);
 		return avatar;
 	}
 
@@ -282,7 +282,7 @@ public class AvatarService {
 	public void clear(MucOptions.User user) {
 		synchronized (this.sizes) {
 			for (Integer size : sizes) {
-				this.mXmppConnectionService.getBitmapCache().remove(key(user, size));
+				ImageUtil.removeBitmapFromCache(key(user, size));
 			}
 		}
 	}
@@ -358,7 +358,7 @@ public class AvatarService {
 				return true;
 			}
 		} else if (user.getAvatar() != null) {
-			Uri uri = mXmppConnectionService.getFileBackend().getAvatarUri(user.getAvatar());
+			Uri uri = AvatarUtil.getAvatarUri(user.getAvatar());
 			if (drawTile(canvas, uri, left, top, right, bottom)) {
 				return true;
 			}
@@ -371,7 +371,7 @@ public class AvatarService {
 	private boolean drawTile(Canvas canvas, Account account, int left, int top, int right, int bottom) {
 		String avatar = account.getAvatar();
 		if (avatar != null) {
-			Uri uri = mXmppConnectionService.getFileBackend().getAvatarUri(avatar);
+			Uri uri = AvatarUtil.getAvatarUri(avatar);
 			if (uri != null) {
 				if (drawTile(canvas, uri, left, top, right, bottom)) {
 					return true;
@@ -393,8 +393,7 @@ public class AvatarService {
 
 	private boolean drawTile(Canvas canvas, Uri uri, int left, int top, int right, int bottom) {
 		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 true;