1 files changed, 1 insertions, 95 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index a4711aa0..3cf50925 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -4,13 +4,8 @@ import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
 import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.text.Spannable;
 import android.text.SpannableString;
 
@@ -32,10 +27,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.lang.ref.WeakReference;
-
 import java.util.List;
-import java.util.concurrent.RejectedExecutionException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -570,33 +562,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         }
     }
 
-
-    private void loadAvatar(Message message, ImageView imageView) {
-        if (cancelPotentialWork(message, imageView)) {
-            int avatarPixel = imageView.getResources().getDimensionPixelOffset(R.dimen.msg_avatar_size);
-            final Bitmap bm = AvatarService.getInstance().get(message, avatarPixel, true);
-            if (bm != null) {
-                imageView.setImageBitmap(bm);
-                imageView.setBackgroundColor(0x00000000);
-            } else {
-                imageView.setBackgroundColor(UIHelper.getColorForName(UIHelper.getMessageDisplayName(message)));
-                imageView.setImageDrawable(null);
-                final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-                final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
-                imageView.setImageDrawable(asyncDrawable);
-                try {
-                    task.execute(message);
-                } catch (final RejectedExecutionException ignored) {
-                }
-            }
-        }
-    }
-
     private void displayAvatar(final Message message, int type, ViewHolder viewHolder) {
         if (type == ME_COMMAND || (type == RECEIVED)) { //  && message.getConversation().getMode() == Conversation.MODE_MULTI
             ImageView imageView = viewHolder.contact_picture;
             if (null != imageView) {
-                this.loadAvatar(message, imageView);
+                AvatarService.getInstance().loadAvatar(message, imageView);
 
                 imageView.setOnClickListener(new OnClickListener() {
 
@@ -842,68 +812,4 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         public TextView remoteFileStatus;
         protected boolean darkBackground;
     }
-
-    class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
-        private final WeakReference<ImageView> imageViewReference;
-        private Message message = null;
-
-        public BitmapWorkerTask(ImageView imageView) {
-            imageViewReference = new WeakReference<>(imageView);
-        }
-
-        @Override
-        protected Bitmap doInBackground(Message... params) {
-            int avatarPixel = activity.getResources().getDimensionPixelOffset(R.dimen.msg_avatar_size);
-            return AvatarService.getInstance().get(params[0], avatarPixel, isCancelled());
-        }
-
-        @Override
-        protected void onPostExecute(Bitmap bitmap) {
-            if (bitmap != null) {
-                final ImageView imageView = imageViewReference.get();
-                if (imageView != null) {
-                    imageView.setImageBitmap(bitmap);
-                    imageView.setBackgroundColor(0x00000000);
-                }
-            }
-        }
-    }
-
-    public static boolean cancelPotentialWork(Message message, ImageView imageView) {
-        final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
-
-        if (bitmapWorkerTask != null) {
-            final Message oldMessage = bitmapWorkerTask.message;
-            if (oldMessage == null || message != oldMessage) {
-                bitmapWorkerTask.cancel(true);
-            } else {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
-        if (imageView != null) {
-            final Drawable drawable = imageView.getDrawable();
-            if (drawable instanceof AsyncDrawable) {
-                final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-                return asyncDrawable.getBitmapWorkerTask();
-            }
-        }
-        return null;
-    }
-
-    static class AsyncDrawable extends BitmapDrawable {
-        private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
-
-        public AsyncDrawable(Resources res, Bitmap bitmap, BitmapWorkerTask bitmapWorkerTask) {
-            super(res, bitmap);
-            bitmapWorkerTaskReference = new WeakReference<>(bitmapWorkerTask);
-        }
-
-        public BitmapWorkerTask getBitmapWorkerTask() {
-            return bitmapWorkerTaskReference.get();
-        }
-    }
 }
\ No newline at end of file