2 files changed, 10 insertions, 12 deletions

diff --git a/src/de/danoeh/antennapod/storage/DownloadRequester.java b/src/de/danoeh/antennapod/storage/DownloadRequester.java
index 38b143a7f..bebffe8f9 100644
--- a/src/de/danoeh/antennapod/storage/DownloadRequester.java
+++ b/src/de/danoeh/antennapod/storage/DownloadRequester.java
@@ -11,11 +11,12 @@ import android.content.Intent;
 import android.util.Log;
 import android.webkit.URLUtil;
 import de.danoeh.antennapod.AppConfig;
-import de.danoeh.antennapod.PodcastApp;
+import de.danoeh.antennapod.feed.EventDistributor;
 import de.danoeh.antennapod.feed.Feed;
 import de.danoeh.antennapod.feed.FeedFile;
 import de.danoeh.antennapod.feed.FeedImage;
 import de.danoeh.antennapod.feed.FeedMedia;
+import de.danoeh.antennapod.preferences.UserPreferences;
 import de.danoeh.antennapod.service.download.DownloadService;
 import de.danoeh.antennapod.util.FileNameGenerator;
 import de.danoeh.antennapod.util.URLChecker;
@@ -23,11 +24,6 @@ import de.danoeh.antennapod.util.URLChecker;
 public class DownloadRequester {
 	private static final String TAG = "DownloadRequester";
 
-	public static String EXTRA_DOWNLOAD_ID = "extra.de.danoeh.antennapod.storage.download_id";
-	public static String EXTRA_ITEM_ID = "extra.de.danoeh.antennapod.storage.item_id";
-
-	public static String ACTION_DOWNLOAD_QUEUED = "action.de.danoeh.antennapod.storage.downloadQueued";
-
 	public static String IMAGE_DOWNLOADPATH = "images/";
 	public static String FEED_DOWNLOADPATH = "cache/";
 	public static String MEDIA_DOWNLOADPATH = "media/";
@@ -70,7 +66,8 @@ public class DownloadRequester {
 						if (AppConfig.DEBUG)
 							Log.d(TAG, "Testing filename " + newName);
 						newDest = new File(dest.getParent(), newName);
-						if (!newDest.exists() && isFilenameAvailable(newDest.toString())) {
+						if (!newDest.exists()
+								&& isFilenameAvailable(newDest.toString())) {
 							if (AppConfig.DEBUG)
 								Log.d(TAG, "File doesn't exist yet. Using "
 										+ newName);
@@ -102,7 +99,7 @@ public class DownloadRequester {
 				queueIntent.putExtra(DownloadService.EXTRA_REQUEST, request);
 				context.sendBroadcast(queueIntent);
 			}
-			context.sendBroadcast(new Intent(ACTION_DOWNLOAD_QUEUED));
+			EventDistributor.getInstance().sendDownloadQueuedBroadcast();
 		} else {
 			Log.e(TAG, "URL " + item.getDownload_url()
 					+ " is already being downloaded");
@@ -123,7 +120,8 @@ public class DownloadRequester {
 				return false;
 			}
 		}
-		if (AppConfig.DEBUG) Log.d(TAG, path + " is available as a download destination");
+		if (AppConfig.DEBUG)
+			Log.d(TAG, path + " is available as a download destination");
 		return true;
 	}
 
@@ -282,7 +280,7 @@ public class DownloadRequester {
 
 	private File getExternalFilesDirOrThrowException(Context context,
 			String type) throws DownloadRequestException {
-		File result = PodcastApp.getDataFolder(context, type);
+		File result = UserPreferences.getDataFolder(context, type);
 		if (result == null) {
 			throw new DownloadRequestException(
 					"Failed to access external storage");
diff --git a/src/de/danoeh/antennapod/storage/PodDBAdapter.java b/src/de/danoeh/antennapod/storage/PodDBAdapter.java
index 4045f8664..f1842800b 100644
--- a/src/de/danoeh/antennapod/storage/PodDBAdapter.java
+++ b/src/de/danoeh/antennapod/storage/PodDBAdapter.java
@@ -334,7 +334,7 @@ public class PodDBAdapter {
 	public void setCompleteFeed(Feed feed) {
 		db.beginTransaction();
 		setFeed(feed);
-		for (FeedItem item : feed.getItems()) {
+		for (FeedItem item : feed.getItemsArray()) {
 			setFeedItem(item);
 		}
 		db.setTransactionSuccessful();
@@ -485,7 +485,7 @@ public class PodDBAdapter {
 		if (feed.getImage() != null) {
 			removeFeedImage(feed.getImage());
 		}
-		for (FeedItem item : feed.getItems()) {
+		for (FeedItem item : feed.getItemsArray()) {
 			removeFeedItem(item);
 		}
 		db.delete(TABLE_NAME_FEEDS, KEY_ID + "=?",