Added support for episode images

4 files changed, 7 insertions, 10 deletions

diff --git a/src/de/danoeh/antennapod/service/PlaybackService.java b/src/de/danoeh/antennapod/service/PlaybackService.java
index 811b02535..8ff115077 100644
--- a/src/de/danoeh/antennapod/service/PlaybackService.java
+++ b/src/de/danoeh/antennapod/service/PlaybackService.java
@@ -41,7 +41,6 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.activity.AudioplayerActivity;
 import de.danoeh.antennapod.activity.VideoplayerActivity;
 import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedComponent;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedManager;
@@ -730,8 +729,7 @@ public class PlaybackService extends Service {
 			prepareImmediately = startWhenPrepared = true;
 		} else {
 			if (AppConfig.DEBUG)
-				Log.d(TAG,
-						"No more episodes available to play");
+				Log.d(TAG, "No more episodes available to play");
 			media = null;
 			prepareImmediately = startWhenPrepared = false;
 			stopForeground(true);
@@ -752,7 +750,8 @@ public class PlaybackService extends Service {
 		if (media != null) {
 			resetVideoSurface();
 			refreshRemoteControlClientState();
-			sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD, notificationCode);
+			sendNotificationBroadcast(NOTIFICATION_TYPE_RELOAD,
+					notificationCode);
 		} else {
 			sendNotificationBroadcast(NOTIFICATION_TYPE_PLAYBACK_END, 0);
 			stopSelf();
@@ -958,12 +957,12 @@ public class PlaybackService extends Service {
 
 		Bitmap icon = null;
 		if (android.os.Build.VERSION.SDK_INT >= 11) {
-			if (media != null && media.getImageFileUrl() != null) {
+			if (media != null && media != null) {
 				int iconSize = getResources().getDimensionPixelSize(
 						android.R.dimen.notification_large_icon_width);
-				icon = BitmapDecoder.decodeBitmap(iconSize,
-						media.getImageFileUrl());
+				icon = BitmapDecoder.decodeBitmapFromWorkerTaskResource(iconSize, media);
 			}
+
 		}
 		if (icon == null) {
 			icon = BitmapFactory.decodeResource(getResources(),
diff --git a/src/de/danoeh/antennapod/service/download/APRedirectHandler.java b/src/de/danoeh/antennapod/service/download/APRedirectHandler.java
index 9416ef9d7..8a31c9390 100644
--- a/src/de/danoeh/antennapod/service/download/APRedirectHandler.java
+++ b/src/de/danoeh/antennapod/service/download/APRedirectHandler.java
@@ -7,8 +7,8 @@ import org.apache.http.HttpResponse;
 import org.apache.http.impl.client.DefaultRedirectHandler;
 import org.apache.http.protocol.HttpContext;
 
-import de.danoeh.antennapod.AppConfig;
 import android.util.Log;
+import de.danoeh.antennapod.AppConfig;
 
 public class APRedirectHandler extends DefaultRedirectHandler {
 	// Identifier for logger
diff --git a/src/de/danoeh/antennapod/service/download/DownloadService.java b/src/de/danoeh/antennapod/service/download/DownloadService.java
index 272b1bf59..e1230e170 100644
--- a/src/de/danoeh/antennapod/service/download/DownloadService.java
+++ b/src/de/danoeh/antennapod/service/download/DownloadService.java
@@ -58,7 +58,6 @@ import de.danoeh.antennapod.feed.FeedImage;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedManager;
 import de.danoeh.antennapod.feed.FeedMedia;
-import de.danoeh.antennapod.preferences.UserPreferences;
 import de.danoeh.antennapod.storage.DownloadRequestException;
 import de.danoeh.antennapod.storage.DownloadRequester;
 import de.danoeh.antennapod.syndication.handler.FeedHandler;
diff --git a/src/de/danoeh/antennapod/service/download/HttpDownloader.java b/src/de/danoeh/antennapod/service/download/HttpDownloader.java
index 07998be0b..f8f26f6fd 100644
--- a/src/de/danoeh/antennapod/service/download/HttpDownloader.java
+++ b/src/de/danoeh/antennapod/service/download/HttpDownloader.java
@@ -27,7 +27,6 @@ import de.danoeh.antennapod.AppConfig;
 import de.danoeh.antennapod.PodcastApp;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.asynctask.DownloadStatus;
-import de.danoeh.antennapod.service.download.APRedirectHandler;
 import de.danoeh.antennapod.util.DownloadError;
 import de.danoeh.antennapod.util.StorageUtils;