Replaced ImageLoader and DiskCache with Picasso

Implemented Picasso Downloaders

Replaced ImageLoader and DiskCache with Picasso

Removed ImageLoader, DiskCache code

7 files changed, 383 insertions, 346 deletions

diff --git a/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
index 33b11774f..641a1368d 100644
--- a/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java
@@ -9,8 +9,9 @@ import android.widget.BaseAdapter;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.asynctask.PicassoProvider;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.util.Converter;
 
@@ -22,10 +23,13 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
     private final Context context;
     private final ItemAccess itemAccess;
 
+    private final int imageSize;
+
     public DownloadedEpisodesListAdapter(Context context, ItemAccess itemAccess) {
         super();
         this.context = context;
         this.itemAccess = itemAccess;
+        this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length_downloaded_item);
     }
 
     @Override
@@ -83,12 +87,11 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter {
         holder.butSecondary.setOnClickListener(secondaryActionListener);
 
 
-        ImageLoader.getInstance().loadThumbnailBitmap(
-                item,
-                holder.imageView,
-                (int) convertView.getResources().getDimension(
-                        R.dimen.thumbnail_length)
-        );
+        PicassoProvider.getMediaMetadataPicassoInstance(context)
+                .load(item.getImageUri())
+                .resize(imageSize, imageSize)
+                .into(holder.imageView);
+
         return convertView;
     }
 
diff --git a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
index 5e857c131..56c3e1ca6 100644
--- a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
@@ -6,9 +6,14 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.widget.*;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.asynctask.PicassoProvider;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedMedia;
 import de.danoeh.antennapod.storage.DownloadRequester;
@@ -19,276 +24,282 @@ import de.danoeh.antennapod.util.Converter;
  * structure of this list is: [header] [queueItems] [header] [unreadItems].
  */
 public class ExternalEpisodesListAdapter extends BaseExpandableListAdapter {
-	private static final String TAG = "ExternalEpisodesListAdapter";
+    private static final String TAG = "ExternalEpisodesListAdapter";
 
-	public static final int GROUP_POS_QUEUE = 0;
-	public static final int GROUP_POS_UNREAD = 1;
+    public static final int GROUP_POS_QUEUE = 0;
+    public static final int GROUP_POS_UNREAD = 1;
 
-	private Context context;
+    private Context context;
     private ItemAccess itemAccess;
 
-	private ActionButtonCallback feedItemActionCallback;
-	private OnGroupActionClicked groupActionCallback;
+    private ActionButtonCallback feedItemActionCallback;
+    private OnGroupActionClicked groupActionCallback;
+
+    private final int imageSize;
 
-	public ExternalEpisodesListAdapter(Context context,
-			ActionButtonCallback callback,
-			OnGroupActionClicked groupActionCallback,
-            ItemAccess itemAccess) {
-		super();
-		this.context = context;
+    public ExternalEpisodesListAdapter(Context context,
+                                       ActionButtonCallback callback,
+                                       OnGroupActionClicked groupActionCallback,
+                                       ItemAccess itemAccess) {
+        super();
+        this.context = context;
         this.itemAccess = itemAccess;
-		this.feedItemActionCallback = callback;
-		this.groupActionCallback = groupActionCallback;
-	}
-
-	@Override
-	public boolean areAllItemsEnabled() {
-		return true;
-	}
-
-	@Override
-	public FeedItem getChild(int groupPosition, int childPosition) {
-		if (groupPosition == GROUP_POS_QUEUE) {
-			return itemAccess.getQueueItemAt(childPosition);
-		} else if (groupPosition == GROUP_POS_UNREAD) {
+        this.feedItemActionCallback = callback;
+        this.groupActionCallback = groupActionCallback;
+        this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length);
+    }
+
+    @Override
+    public boolean areAllItemsEnabled() {
+        return true;
+    }
+
+    @Override
+    public FeedItem getChild(int groupPosition, int childPosition) {
+        if (groupPosition == GROUP_POS_QUEUE) {
+            return itemAccess.getQueueItemAt(childPosition);
+        } else if (groupPosition == GROUP_POS_UNREAD) {
             return itemAccess.getUnreadItemAt(childPosition);
-   		}
-		return null;
-	}
-
-	@Override
-	public long getChildId(int groupPosition, int childPosition) {
-		return childPosition;
-	}
-
-	@Override
-	public View getChildView(int groupPosition, final int childPosition,
-			boolean isLastChild, View convertView, ViewGroup parent) {
-		Holder holder;
-		final FeedItem item = getChild(groupPosition, childPosition);
-
-		if (convertView == null) {
-			holder = new Holder();
-			LayoutInflater inflater = (LayoutInflater) context
-					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			convertView = inflater.inflate(R.layout.external_itemlist_item,
-					parent, false);
-			holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-			holder.feedTitle = (TextView) convertView
-					.findViewById(R.id.txtvFeedname);
-			holder.lenSize = (TextView) convertView
-					.findViewById(R.id.txtvLenSize);
-			holder.downloadStatus = (ImageView) convertView
-					.findViewById(R.id.imgvDownloadStatus);
-			holder.feedImage = (ImageView) convertView
-					.findViewById(R.id.imgvFeedimage);
-			holder.butAction = (ImageButton) convertView
-					.findViewById(R.id.butAction);
-			holder.statusPlaying = (View) convertView
-					.findViewById(R.id.statusPlaying);
-			holder.episodeProgress = (ProgressBar) convertView
-					.findViewById(R.id.pbar_episode_progress);
-			convertView.setTag(holder);
-		} else {
-			holder = (Holder) convertView.getTag();
-		}
-
-		holder.title.setText(item.getTitle());
-		holder.feedTitle.setText(item.getFeed().getTitle());
-		FeedItem.State state = item.getState();
-
-		if (groupPosition == GROUP_POS_QUEUE) {
-			switch (state) {
-			case PLAYING:
-				holder.statusPlaying.setVisibility(View.VISIBLE);
-				holder.episodeProgress.setVisibility(View.VISIBLE);
-				break;
-			case IN_PROGRESS:
-				holder.statusPlaying.setVisibility(View.GONE);
-				holder.episodeProgress.setVisibility(View.VISIBLE);
-				break;
-			case NEW:
-				holder.statusPlaying.setVisibility(View.GONE);
-				holder.episodeProgress.setVisibility(View.GONE);
-				break;
-			default:
-				holder.statusPlaying.setVisibility(View.GONE);
-				holder.episodeProgress.setVisibility(View.GONE);
-				break;
-			}
-		} else {
-			holder.statusPlaying.setVisibility(View.GONE);
-			holder.episodeProgress.setVisibility(View.GONE);
-		}
-
-		FeedMedia media = item.getMedia();
-		if (media != null) {
-
-			if (state == FeedItem.State.PLAYING
-					|| state == FeedItem.State.IN_PROGRESS) {
-				if (media.getDuration() > 0) {
-					holder.episodeProgress.setProgress((int) (((double) media
-							.getPosition()) / media.getDuration() * 100));
-					holder.lenSize.setText(Converter
-							.getDurationStringLong(media.getDuration()
-									- media.getPosition()));
-				}
-			} else if (!media.isDownloaded()) {
-				holder.lenSize.setText(context.getString(R.string.size_prefix)
-						+ Converter.byteToString(media.getSize()));
-			} else {
-				holder.lenSize.setText(context
-						.getString(R.string.length_prefix)
-						+ Converter.getDurationStringLong(media.getDuration()));
-			}
-
-			TypedArray drawables = context.obtainStyledAttributes(new int[] {
-					R.attr.av_download, R.attr.navigation_refresh });
-            final int[] labels = new int[] {R.string.status_downloaded_label, R.string.downloading_label};
-			holder.lenSize.setVisibility(View.VISIBLE);
-			if (!media.isDownloaded()) {
-				if (DownloadRequester.getInstance().isDownloadingFile(media)) {
-					holder.downloadStatus.setVisibility(View.VISIBLE);
-					holder.downloadStatus.setImageDrawable(drawables
-							.getDrawable(1));
+        }
+        return null;
+    }
+
+    @Override
+    public long getChildId(int groupPosition, int childPosition) {
+        return childPosition;
+    }
+
+    @Override
+    public View getChildView(int groupPosition, final int childPosition,
+                             boolean isLastChild, View convertView, ViewGroup parent) {
+        Holder holder;
+        final FeedItem item = getChild(groupPosition, childPosition);
+
+        if (convertView == null) {
+            holder = new Holder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            convertView = inflater.inflate(R.layout.external_itemlist_item,
+                    parent, false);
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.feedTitle = (TextView) convertView
+                    .findViewById(R.id.txtvFeedname);
+            holder.lenSize = (TextView) convertView
+                    .findViewById(R.id.txtvLenSize);
+            holder.downloadStatus = (ImageView) convertView
+                    .findViewById(R.id.imgvDownloadStatus);
+            holder.feedImage = (ImageView) convertView
+                    .findViewById(R.id.imgvFeedimage);
+            holder.butAction = (ImageButton) convertView
+                    .findViewById(R.id.butAction);
+            holder.statusPlaying = (View) convertView
+                    .findViewById(R.id.statusPlaying);
+            holder.episodeProgress = (ProgressBar) convertView
+                    .findViewById(R.id.pbar_episode_progress);
+            convertView.setTag(holder);
+        } else {
+            holder = (Holder) convertView.getTag();
+        }
+
+        holder.title.setText(item.getTitle());
+        holder.feedTitle.setText(item.getFeed().getTitle());
+        FeedItem.State state = item.getState();
+
+        if (groupPosition == GROUP_POS_QUEUE) {
+            switch (state) {
+                case PLAYING:
+                    holder.statusPlaying.setVisibility(View.VISIBLE);
+                    holder.episodeProgress.setVisibility(View.VISIBLE);
+                    break;
+                case IN_PROGRESS:
+                    holder.statusPlaying.setVisibility(View.GONE);
+                    holder.episodeProgress.setVisibility(View.VISIBLE);
+                    break;
+                case NEW:
+                    holder.statusPlaying.setVisibility(View.GONE);
+                    holder.episodeProgress.setVisibility(View.GONE);
+                    break;
+                default:
+                    holder.statusPlaying.setVisibility(View.GONE);
+                    holder.episodeProgress.setVisibility(View.GONE);
+                    break;
+            }
+        } else {
+            holder.statusPlaying.setVisibility(View.GONE);
+            holder.episodeProgress.setVisibility(View.GONE);
+        }
+
+        FeedMedia media = item.getMedia();
+        if (media != null) {
+
+            if (state == FeedItem.State.PLAYING
+                    || state == FeedItem.State.IN_PROGRESS) {
+                if (media.getDuration() > 0) {
+                    holder.episodeProgress.setProgress((int) (((double) media
+                            .getPosition()) / media.getDuration() * 100));
+                    holder.lenSize.setText(Converter
+                            .getDurationStringLong(media.getDuration()
+                                    - media.getPosition()));
+                }
+            } else if (!media.isDownloaded()) {
+                holder.lenSize.setText(context.getString(R.string.size_prefix)
+                        + Converter.byteToString(media.getSize()));
+            } else {
+                holder.lenSize.setText(context
+                        .getString(R.string.length_prefix)
+                        + Converter.getDurationStringLong(media.getDuration()));
+            }
+
+            TypedArray drawables = context.obtainStyledAttributes(new int[]{
+                    R.attr.av_download, R.attr.navigation_refresh});
+            final int[] labels = new int[]{R.string.status_downloaded_label, R.string.downloading_label};
+            holder.lenSize.setVisibility(View.VISIBLE);
+            if (!media.isDownloaded()) {
+                if (DownloadRequester.getInstance().isDownloadingFile(media)) {
+                    holder.downloadStatus.setVisibility(View.VISIBLE);
+                    holder.downloadStatus.setImageDrawable(drawables
+                            .getDrawable(1));
                     holder.downloadStatus.setContentDescription(context.getString(labels[1]));
-				} else {
-					holder.downloadStatus.setVisibility(View.INVISIBLE);
-				}
-			} else {
-				holder.downloadStatus.setVisibility(View.VISIBLE);
-				holder.downloadStatus
-						.setImageDrawable(drawables.getDrawable(0));
+                } else {
+                    holder.downloadStatus.setVisibility(View.INVISIBLE);
+                }
+            } else {
+                holder.downloadStatus.setVisibility(View.VISIBLE);
+                holder.downloadStatus
+                        .setImageDrawable(drawables.getDrawable(0));
                 holder.downloadStatus.setContentDescription(context.getString(labels[0]));
-			}
-		} else {
-			holder.downloadStatus.setVisibility(View.INVISIBLE);
-			holder.lenSize.setVisibility(View.INVISIBLE);
-		}
-
-		ImageLoader.getInstance().loadThumbnailBitmap(
-				item,
-				holder.feedImage,
-				(int) convertView.getResources().getDimension(
-						R.dimen.thumbnail_length));
-		holder.butAction.setFocusable(false);
-		holder.butAction.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				feedItemActionCallback.onActionButtonPressed(item);
-			}
-		});
-
-		return convertView;
-
-	}
-
-	static class Holder {
-		TextView title;
-		TextView feedTitle;
-		TextView lenSize;
-		ImageView downloadStatus;
-		ImageView feedImage;
-		ImageButton butAction;
-		View statusPlaying;
-		ProgressBar episodeProgress;
-	}
-
-	@Override
-	public int getChildrenCount(int groupPosition) {
-		if (groupPosition == GROUP_POS_QUEUE) {
-			return itemAccess.getQueueSize();
-		} else if (groupPosition == GROUP_POS_UNREAD) {
-			return itemAccess.getUnreadItemsSize();
-		}
-		return 0;
-	}
-
-	@Override
-	public int getGroupCount() {
-		// Hide 'unread items' group if empty
-		if (itemAccess.getUnreadItemsSize() > 0) {
-			return 2;
-		} else {
-			return 1;
-		}
-	}
-
-	@Override
-	public long getGroupId(int groupPosition) {
-		return groupPosition;
-	}
-
-	@Override
-	public View getGroupView(final int groupPosition, boolean isExpanded,
-			View convertView, ViewGroup parent) {
-		LayoutInflater inflater = (LayoutInflater) context
-				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		convertView = inflater.inflate(R.layout.feeditemlist_header, parent, false);
-		TextView headerTitle = (TextView) convertView
-				.findViewById(0);
-		ImageButton actionButton = (ImageButton) convertView
-				.findViewById(R.id.butAction);	
-		TextView numItems = (TextView) convertView.findViewById(0);
-		
-		String headerString = null;
-		int childrenCount = 0;
-		
-		if (groupPosition == 0) {
-			headerString = context.getString(R.string.queue_label);
-			childrenCount = getChildrenCount(GROUP_POS_QUEUE);
-		} else {
-			headerString = context.getString(R.string.waiting_list_label);
-			childrenCount = getChildrenCount(GROUP_POS_UNREAD);
-		}
-		headerTitle.setText(headerString);
-		if (childrenCount <= 0) {
-			numItems.setVisibility(View.INVISIBLE);
-		} else {
-			numItems.setVisibility(View.VISIBLE);
-			numItems.setText(Integer.toString(childrenCount));
-		}
-		actionButton.setFocusable(false);
-		actionButton.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				groupActionCallback.onClick(getGroupId(groupPosition));
-			}
-		});
-		return convertView;
-	}
-
-	@Override
-	public boolean isEmpty() {
-		return itemAccess.getUnreadItemsSize() == 0
-				&& itemAccess.getQueueSize() == 0;
-	}
-
-	@Override
-	public Object getGroup(int groupPosition) {
-		return null;
-	}
-
-	@Override
-	public boolean hasStableIds() {
-		return true;
-	}
-
-	@Override
-	public boolean isChildSelectable(int groupPosition, int childPosition) {
-		return true;
-	}
-
-	public interface OnGroupActionClicked {
-		public void onClick(long groupId);
-	}
+            }
+        } else {
+            holder.downloadStatus.setVisibility(View.INVISIBLE);
+            holder.lenSize.setVisibility(View.INVISIBLE);
+        }
+
+        PicassoProvider.getMediaMetadataPicassoInstance(context)
+                .load(item.getImageUri())
+                .resize(imageSize, imageSize)
+                .into(holder.feedImage);
+
+        holder.butAction.setFocusable(false);
+        holder.butAction.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                feedItemActionCallback.onActionButtonPressed(item);
+            }
+        });
+
+        return convertView;
+
+    }
+
+    static class Holder {
+        TextView title;
+        TextView feedTitle;
+        TextView lenSize;
+        ImageView downloadStatus;
+        ImageView feedImage;
+        ImageButton butAction;
+        View statusPlaying;
+        ProgressBar episodeProgress;
+    }
+
+    @Override
+    public int getChildrenCount(int groupPosition) {
+        if (groupPosition == GROUP_POS_QUEUE) {
+            return itemAccess.getQueueSize();
+        } else if (groupPosition == GROUP_POS_UNREAD) {
+            return itemAccess.getUnreadItemsSize();
+        }
+        return 0;
+    }
+
+    @Override
+    public int getGroupCount() {
+        // Hide 'unread items' group if empty
+        if (itemAccess.getUnreadItemsSize() > 0) {
+            return 2;
+        } else {
+            return 1;
+        }
+    }
+
+    @Override
+    public long getGroupId(int groupPosition) {
+        return groupPosition;
+    }
+
+    @Override
+    public View getGroupView(final int groupPosition, boolean isExpanded,
+                             View convertView, ViewGroup parent) {
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        convertView = inflater.inflate(R.layout.feeditemlist_header, parent, false);
+        TextView headerTitle = (TextView) convertView
+                .findViewById(0);
+        ImageButton actionButton = (ImageButton) convertView
+                .findViewById(R.id.butAction);
+        TextView numItems = (TextView) convertView.findViewById(0);
+
+        String headerString = null;
+        int childrenCount = 0;
+
+        if (groupPosition == 0) {
+            headerString = context.getString(R.string.queue_label);
+            childrenCount = getChildrenCount(GROUP_POS_QUEUE);
+        } else {
+            headerString = context.getString(R.string.waiting_list_label);
+            childrenCount = getChildrenCount(GROUP_POS_UNREAD);
+        }
+        headerTitle.setText(headerString);
+        if (childrenCount <= 0) {
+            numItems.setVisibility(View.INVISIBLE);
+        } else {
+            numItems.setVisibility(View.VISIBLE);
+            numItems.setText(Integer.toString(childrenCount));
+        }
+        actionButton.setFocusable(false);
+        actionButton.setOnClickListener(new OnClickListener() {
+
+            @Override
+            public void onClick(View v) {
+                groupActionCallback.onClick(getGroupId(groupPosition));
+            }
+        });
+        return convertView;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return itemAccess.getUnreadItemsSize() == 0
+                && itemAccess.getQueueSize() == 0;
+    }
+
+    @Override
+    public Object getGroup(int groupPosition) {
+        return null;
+    }
+
+    @Override
+    public boolean hasStableIds() {
+        return true;
+    }
+
+    @Override
+    public boolean isChildSelectable(int groupPosition, int childPosition) {
+        return true;
+    }
+
+    public interface OnGroupActionClicked {
+        public void onClick(long groupId);
+    }
 
     public static interface ItemAccess {
         public int getQueueSize();
+
         public int getUnreadItemsSize();
+
         public FeedItem getQueueItemAt(int position);
+
         public FeedItem getUnreadItemAt(int position);
     }
 
diff --git a/src/de/danoeh/antennapod/adapter/NavListAdapter.java b/src/de/danoeh/antennapod/adapter/NavListAdapter.java
index 9676372fb..ed85c8836 100644
--- a/src/de/danoeh/antennapod/adapter/NavListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/NavListAdapter.java
@@ -11,7 +11,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.asynctask.PicassoProvider;
 import de.danoeh.antennapod.feed.Feed;
 
 /**
@@ -32,6 +32,8 @@ public class NavListAdapter extends BaseAdapter {
     private ItemAccess itemAccess;
     private Context context;
 
+    private final int imageSize;
+
     public NavListAdapter(ItemAccess itemAccess, Context context) {
         this.itemAccess = itemAccess;
         this.context = context;
@@ -41,6 +43,7 @@ public class NavListAdapter extends BaseAdapter {
         drawables = new Drawable[]{ta.getDrawable(0), ta.getDrawable(1), ta.getDrawable(2),
                 ta.getDrawable(3), ta.getDrawable(4)};
         ta.recycle();
+        this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length_navlist);
     }
 
     @Override
@@ -189,7 +192,11 @@ public class NavListAdapter extends BaseAdapter {
         }
 
         holder.title.setText(feed.getTitle());
-        ImageLoader.getInstance().loadThumbnailBitmap(feed.getImage(), holder.image, (int) context.getResources().getDimension(R.dimen.thumbnail_length_navlist));
+
+        PicassoProvider.getDefaultPicassoInstance(context)
+                .load(feed.getImageUri())
+                .resize(imageSize, imageSize)
+                .into(holder.image);
 
         return convertView;
     }
diff --git a/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
index 07fd3e6b1..4370de14d 100644
--- a/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java
@@ -5,9 +5,14 @@ import android.text.format.DateUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.*;
+import android.widget.BaseAdapter;
+import android.widget.ImageButton;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.asynctask.PicassoProvider;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedMedia;
 import de.danoeh.antennapod.storage.DownloadRequester;
@@ -22,6 +27,7 @@ public class NewEpisodesListAdapter extends BaseAdapter {
     private final ItemAccess itemAccess;
     private final ActionButtonCallback actionButtonCallback;
     private final ActionButtonUtils actionButtonUtils;
+    private final int imageSize;
 
     public NewEpisodesListAdapter(Context context, ItemAccess itemAccess, ActionButtonCallback actionButtonCallback) {
         super();
@@ -29,6 +35,7 @@ public class NewEpisodesListAdapter extends BaseAdapter {
         this.itemAccess = itemAccess;
         this.actionButtonUtils = new ActionButtonUtils(context);
         this.actionButtonCallback = actionButtonCallback;
+        this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length_itemlist);
     }
 
     @Override
@@ -124,13 +131,11 @@ public class NewEpisodesListAdapter extends BaseAdapter {
         holder.butSecondary.setTag(item);
         holder.butSecondary.setOnClickListener(secondaryActionListener);
 
+        PicassoProvider.getMediaMetadataPicassoInstance(context)
+                .load(item.getImageUri())
+                .resize(imageSize, imageSize)
+                .into(holder.imageView);
 
-        ImageLoader.getInstance().loadThumbnailBitmap(
-                item,
-                holder.imageView,
-                (int) convertView.getResources().getDimension(
-                        R.dimen.thumbnail_length)
-        );
         return convertView;
     }
 
diff --git a/src/de/danoeh/antennapod/adapter/QueueListAdapter.java b/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
index f671ba5c6..c670089b9 100644
--- a/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/QueueListAdapter.java
@@ -6,7 +6,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.*;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.asynctask.PicassoProvider;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedMedia;
 import de.danoeh.antennapod.storage.DownloadRequester;
@@ -22,12 +22,15 @@ public class QueueListAdapter extends BaseAdapter {
     private final ActionButtonCallback actionButtonCallback;
     private final ActionButtonUtils actionButtonUtils;
 
+    private final int imageSize;
+
     public QueueListAdapter(Context context, ItemAccess itemAccess, ActionButtonCallback actionButtonCallback) {
         super();
         this.context = context;
         this.itemAccess = itemAccess;
         this.actionButtonUtils = new ActionButtonUtils(context);
         this.actionButtonCallback = actionButtonCallback;
+        this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length_queue_item);
 
     }
 
@@ -92,13 +95,11 @@ public class QueueListAdapter extends BaseAdapter {
         holder.butSecondary.setTag(item);
         holder.butSecondary.setOnClickListener(secondaryActionListener);
 
+        PicassoProvider.getMediaMetadataPicassoInstance(context)
+                .load(item.getImageUri())
+                .resize(imageSize, imageSize)
+                .into(holder.imageView);
 
-        ImageLoader.getInstance().loadThumbnailBitmap(
-                item,
-                holder.imageView,
-                (int) convertView.getResources().getDimension(
-                        R.dimen.thumbnail_length)
-        );
         return convertView;
     }
 
diff --git a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index ecfbb4660..6b1fefaad 100644
--- a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
@@ -4,28 +4,31 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
+
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.ImageLoader;
+import de.danoeh.antennapod.asynctask.PicassoProvider;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedComponent;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.SearchResult;
 
-import java.util.List;
-
-/** List adapter for search activity. */
+/**
+ * List adapter for search activity.
+ */
 public class SearchlistAdapter extends BaseAdapter {
 
-	private final Context context;
+    private final Context context;
     private final ItemAccess itemAccess;
 
+    private final int imageSize;
+
     public SearchlistAdapter(Context context, ItemAccess itemAccess) {
         this.context = context;
         this.itemAccess = itemAccess;
+        this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length);
     }
 
     @Override
@@ -44,61 +47,65 @@ public class SearchlistAdapter extends BaseAdapter {
     }
 
     @Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		final Holder holder;
-		SearchResult result = getItem(position);
-		FeedComponent component = result.getComponent();
-
-		// Inflate Layout
-		if (convertView == null) {
-			holder = new Holder();
-			LayoutInflater inflater = (LayoutInflater) context
-					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-
-			convertView = inflater.inflate(R.layout.searchlist_item, parent, false);
-			holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
-			holder.cover = (ImageView) convertView
-					.findViewById(R.id.imgvFeedimage);
-			holder.subtitle = (TextView) convertView
-					.findViewById(R.id.txtvSubtitle);
-
-			convertView.setTag(holder);
-		} else {
-			holder = (Holder) convertView.getTag();
-		}
-		if (component.getClass() == Feed.class) {
-			final Feed feed = (Feed) component;
-			holder.title.setText(feed.getTitle());
-			holder.subtitle.setVisibility(View.GONE);
-			ImageLoader.getInstance().loadThumbnailBitmap(feed.getImage(),
-					holder.cover, (int) convertView.getResources().getDimension(R.dimen.thumbnail_length));
-		} else if (component.getClass() == FeedItem.class) {
-			final FeedItem item = (FeedItem) component;
-			holder.title.setText(item.getTitle());
-			if (result.getSubtitle() != null) {
-				holder.subtitle.setVisibility(View.VISIBLE);
-				holder.subtitle.setText(result.getSubtitle());
-			}
-
-			ImageLoader.getInstance().loadThumbnailBitmap(
-					item.getFeed().getImage(),
-					holder.cover,
-					(int) convertView.getResources().getDimension(
-							R.dimen.thumbnail_length));
-
-		}
-
-		return convertView;
-	}
-
-	static class Holder {
-		ImageView cover;
-		TextView title;
-		TextView subtitle;
-	}
+    public View getView(int position, View convertView, ViewGroup parent) {
+        final Holder holder;
+        SearchResult result = getItem(position);
+        FeedComponent component = result.getComponent();
+
+        // Inflate Layout
+        if (convertView == null) {
+            holder = new Holder();
+            LayoutInflater inflater = (LayoutInflater) context
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+
+            convertView = inflater.inflate(R.layout.searchlist_item, parent, false);
+            holder.title = (TextView) convertView.findViewById(R.id.txtvTitle);
+            holder.cover = (ImageView) convertView
+                    .findViewById(R.id.imgvFeedimage);
+            holder.subtitle = (TextView) convertView
+                    .findViewById(R.id.txtvSubtitle);
+
+            convertView.setTag(holder);
+        } else {
+            holder = (Holder) convertView.getTag();
+        }
+        if (component.getClass() == Feed.class) {
+            final Feed feed = (Feed) component;
+            holder.title.setText(feed.getTitle());
+            holder.subtitle.setVisibility(View.GONE);
+
+            PicassoProvider.getDefaultPicassoInstance(context)
+                    .load(feed.getImageUri())
+                    .resize(imageSize, imageSize)
+                    .into(holder.cover);
+
+        } else if (component.getClass() == FeedItem.class) {
+            final FeedItem item = (FeedItem) component;
+            holder.title.setText(item.getTitle());
+            if (result.getSubtitle() != null) {
+                holder.subtitle.setVisibility(View.VISIBLE);
+                holder.subtitle.setText(result.getSubtitle());
+            }
+
+            PicassoProvider.getDefaultPicassoInstance(context)
+                    .load(item.getFeed().getImageUri())
+                    .resize(imageSize, imageSize)
+                    .into(holder.cover);
+
+        }
+
+        return convertView;
+    }
+
+    static class Holder {
+        ImageView cover;
+        TextView title;
+        TextView subtitle;
+    }
 
     public static interface ItemAccess {
         int getCount();
+
         SearchResult getItem(int position);
     }
 
diff --git a/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java b/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
index f20232a6f..dcad2d524 100644
--- a/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java
@@ -7,22 +7,21 @@ import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.ImageDiskCache;
-import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
 
 import java.util.List;
 
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.asynctask.PicassoProvider;
+import de.danoeh.antennapod.gpoddernet.model.GpodnetPodcast;
+
 /**
  * Adapter for displaying a list of GPodnetPodcast-Objects.
  */
 public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> {
-    private final ImageDiskCache diskCache;
     private final int thumbnailLength;
 
     public PodcastListAdapter(Context context, int resource, List<GpodnetPodcast> objects) {
         super(context, resource, objects);
-        diskCache = ImageDiskCache.getDefaultInstance();
         thumbnailLength = (int) context.getResources().getDimension(R.dimen.thumbnail_length);
     }
 
@@ -50,7 +49,11 @@ public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> {
 
         holder.title.setText(podcast.getTitle());
         holder.description.setText(podcast.getDescription());
-        diskCache.loadThumbnailBitmap(podcast.getLogoUrl(), holder.image, thumbnailLength);
+
+        PicassoProvider.getDefaultPicassoInstance(convertView.getContext())
+                .load(podcast.getLogoUrl())
+                .resize(thumbnailLength, thumbnailLength)
+                .into(holder.image);
 
         return convertView;
     }