summaryrefslogtreecommitdiff
path: root/core/src/main
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2015-06-25 19:13:59 -0400
committerTom Hennen <TomHennen@users.noreply.github.com>2015-06-25 19:13:59 -0400
commitddf34dccf385e4f2cd5a7d5d7d501b32d0010eb6 (patch)
treec21acafb39273411fe31ad347d5098a208432f36 /core/src/main
parent17814004b5943cdc61e03bf7bf2c452df89f1f4b (diff)
parente3d0f8fbe51c95c26e03ecdbdcd2e3a869117fd4 (diff)
downloadAntennaPod-ddf34dccf385e4f2cd5a7d5d7d501b32d0010eb6.zip
Merge pull request #962 from corecode/gpoddernet-episode-action-crash
gpoddernet: do not crash on unknown remote actions
Diffstat (limited to 'core/src/main')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
index bd6210d13..efe39485e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/gpoddernet/model/GpodnetEpisodeAction.java
@@ -93,7 +93,12 @@ public class GpodnetEpisodeAction {
if(StringUtils.isEmpty(podcast) || StringUtils.isEmpty(episode) || StringUtils.isEmpty(actionString)) {
return null;
}
- GpodnetEpisodeAction.Action action = GpodnetEpisodeAction.Action.valueOf(actionString.toUpperCase());
+ GpodnetEpisodeAction.Action action;
+ try {
+ action = GpodnetEpisodeAction.Action.valueOf(actionString.toUpperCase());
+ } catch (IllegalArgumentException e) {
+ return null;
+ }
String deviceId = object.optString("device", "");
GpodnetEpisodeAction.Builder builder = new GpodnetEpisodeAction.Builder(podcast, episode, action)
.deviceId(deviceId);