summaryrefslogtreecommitdiff
path: root/src/de/danoeh/antennapod/util
diff options
context:
space:
mode:
authordaniel oeh <daniel.oeh@gmail.com>2012-09-23 16:40:44 +0200
committerdaniel oeh <daniel.oeh@gmail.com>2012-09-23 16:40:44 +0200
commit92feabbb5d2cf1362812a5c71bc27d9b8820093f (patch)
tree2dc22dd97bc764b0de97683653a69f6e36e4f66b /src/de/danoeh/antennapod/util
parentaeed5871e447d5d13f4daeaf0543304000158af9 (diff)
downloadAntennaPod-92feabbb5d2cf1362812a5c71bc27d9b8820093f.zip
DownloadRequester now throws an exception if request is invalid
Diffstat (limited to 'src/de/danoeh/antennapod/util')
-rw-r--r--src/de/danoeh/antennapod/util/DownloadError.java4
-rw-r--r--src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java3
-rw-r--r--src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java6
3 files changed, 10 insertions, 3 deletions
diff --git a/src/de/danoeh/antennapod/util/DownloadError.java b/src/de/danoeh/antennapod/util/DownloadError.java
index f5eaba733..4723a521c 100644
--- a/src/de/danoeh/antennapod/util/DownloadError.java
+++ b/src/de/danoeh/antennapod/util/DownloadError.java
@@ -16,6 +16,7 @@ public class DownloadError {
public static final int ERROR_HTTP_DATA_ERROR = 9;
public static final int ERROR_NOT_ENOUGH_SPACE = 10;
public static final int ERROR_UNKNOWN_HOST = 11;
+ public static final int ERROR_REQUEST_ERROR = 12;
/** Get a human-readable string for a specific error code. */
public static String getErrorString(Context context, int code) {
@@ -45,6 +46,9 @@ public class DownloadError {
case ERROR_UNKNOWN_HOST:
resId = R.string.download_error_unknown_host;
break;
+ case ERROR_REQUEST_ERROR:
+ resId = R.string.download_error_request_error;
+ break;
default:
resId = R.string.download_error_error_unknown;
}
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
index 1acb5a9f7..91f199ce0 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
@@ -13,6 +13,7 @@ import de.danoeh.antennapod.R;
import de.danoeh.antennapod.asynctask.FlattrClickWorker;
import de.danoeh.antennapod.feed.FeedItem;
import de.danoeh.antennapod.feed.FeedManager;
+import de.danoeh.antennapod.storage.DownloadRequestException;
import de.danoeh.antennapod.storage.DownloadRequester;
import de.danoeh.antennapod.util.ShareUtils;
@@ -64,7 +65,7 @@ public class FeedItemMenuHandler {
}
public static boolean onMenuItemClicked(Context context, MenuItem item,
- FeedItem selectedItem) {
+ FeedItem selectedItem) throws DownloadRequestException {
DownloadRequester requester = DownloadRequester.getInstance();
FeedManager manager = FeedManager.getInstance();
switch (item.getItemId()) {
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
index 631169f8a..3a78ffb30 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedMenuHandler.java
@@ -16,6 +16,7 @@ import de.danoeh.antennapod.asynctask.FlattrClickWorker;
import de.danoeh.antennapod.feed.Feed;
import de.danoeh.antennapod.feed.FeedManager;
import de.danoeh.antennapod.service.download.DownloadService;
+import de.danoeh.antennapod.storage.DownloadRequestException;
import de.danoeh.antennapod.storage.DownloadRequester;
import de.danoeh.antennapod.util.ShareUtils;
@@ -51,9 +52,10 @@ public class FeedMenuHandler {
return true;
}
- /** NOTE: This method does not handle clicks on the 'remove feed' - item. */
+ /** NOTE: This method does not handle clicks on the 'remove feed' - item.
+ * @throws DownloadRequestException */
public static boolean onOptionsItemClicked(Context context, MenuItem item,
- Feed selectedFeed) {
+ Feed selectedFeed) throws DownloadRequestException {
FeedManager manager = FeedManager.getInstance();
switch (item.getItemId()) {
case R.id.show_info_item: