avatar handling refactored

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/tasks/AvatarBitmapTask.java b/src/main/java/de/thedevstack/conversationsplus/ui/tasks/AvatarBitmapTask.java
index ec89b001..b20985a4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/tasks/AvatarBitmapTask.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/tasks/AvatarBitmapTask.java
@@ -9,7 +9,8 @@ import java.lang.ref.WeakReference;
 import de.thedevstack.conversationsplus.dto.LoadAvatarFor;
 import de.thedevstack.conversationsplus.entities.Conversation;
 import de.thedevstack.conversationsplus.entities.Message;
-import de.thedevstack.conversationsplus.services.AvatarService;
+import de.thedevstack.conversationsplus.services.avatar.AvatarCache;
+import de.thedevstack.conversationsplus.services.avatar.AvatarService;
 
 /**
  *
@@ -26,9 +27,9 @@ public class AvatarBitmapTask<T extends LoadAvatarFor> extends AsyncTask<T, Void
     @Override
     protected Bitmap doInBackground(T... params) {
         if (params[0] instanceof Conversation) {
-            return AvatarService.getInstance().get((Conversation)params[0], this.avatarSize);
+            return AvatarCache.get((Conversation)params[0], this.avatarSize);
         } else if (params[0] instanceof Message) {
-            return AvatarService.getInstance().get((Message) params[0], this.avatarSize, isCancelled()); // Wirklich die richtige Nutzung von isCancelled()???
+            return AvatarCache.get((Message) params[0], this.avatarSize, isCancelled()); // Wirklich die richtige Nutzung von isCancelled()???
         } else {
             return null;
         }