FeedImageLoader now works independently from FeedImages

3 files changed, 10 insertions, 9 deletions

diff --git a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
index 6d295d3e2..caf9e71b2 100644
--- a/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java
@@ -11,7 +11,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.FeedImageLoader;
+import de.danoeh.antennapod.asynctask.ImageLoader;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.feed.FeedMedia;
@@ -162,7 +162,7 @@ public class ExternalEpisodesListAdapter extends BaseExpandableListAdapter {
 		}
 
 		holder.feedImage.setTag(item.getFeed().getImage());
-		FeedImageLoader.getInstance().loadThumbnailBitmap(
+		ImageLoader.getInstance().loadThumbnailBitmap(
 				item.getFeed().getImage(),
 				holder.feedImage,
 				(int) convertView.getResources().getDimension(
diff --git a/src/de/danoeh/antennapod/adapter/FeedlistAdapter.java b/src/de/danoeh/antennapod/adapter/FeedlistAdapter.java
index 6316742a3..e3f07a277 100644
--- a/src/de/danoeh/antennapod/adapter/FeedlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/FeedlistAdapter.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.FeedImageLoader;
+import de.danoeh.antennapod.asynctask.ImageLoader;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.storage.DownloadRequester;
@@ -24,14 +24,14 @@ public class FeedlistAdapter extends BaseAdapter {
 	private FeedManager manager = FeedManager.getInstance();
 
 	private int selectedItemIndex;
-	private FeedImageLoader imageLoader;
+	private ImageLoader imageLoader;
 	public static final int SELECTION_NONE = -1;
 
 	public FeedlistAdapter(Context context) {
 		super();
 		this.context = context;
 		selectedItemIndex = SELECTION_NONE;
-		imageLoader = FeedImageLoader.getInstance();
+		imageLoader = ImageLoader.getInstance();
 	}
 
 	@Override
@@ -109,7 +109,8 @@ public class FeedlistAdapter extends BaseAdapter {
 		}
 
 		holder.image.setTag(feed.getImage());
-
+		final String imageUrl = (feed.getImage() != null) ? 
+				feed.getImage().getFile_url() : null;
 		imageLoader.loadThumbnailBitmap(
 				feed.getImage(),
 				holder.image,
diff --git a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java b/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
index c7f42e7cb..129289d30 100644
--- a/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
+++ b/src/de/danoeh/antennapod/adapter/SearchlistAdapter.java
@@ -10,7 +10,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.asynctask.FeedImageLoader;
+import de.danoeh.antennapod.asynctask.ImageLoader;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedComponent;
 import de.danoeh.antennapod.feed.FeedItem;
@@ -51,7 +51,7 @@ public class SearchlistAdapter extends ArrayAdapter<SearchResult> {
 			final Feed feed = (Feed) component;
 			holder.title.setText(feed.getTitle());
 			holder.subtitle.setVisibility(View.GONE);
-			FeedImageLoader.getInstance().loadThumbnailBitmap(feed.getImage(),
+			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;
@@ -61,7 +61,7 @@ public class SearchlistAdapter extends ArrayAdapter<SearchResult> {
 				holder.subtitle.setText(result.getSubtitle());
 			}
 
-			FeedImageLoader.getInstance().loadThumbnailBitmap(
+			ImageLoader.getInstance().loadThumbnailBitmap(
 					item.getFeed().getImage(),
 					holder.cover,
 					(int) convertView.getResources().getDimension(