summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/de/podfetcher/feed/FeedManager.java8
-rw-r--r--src/de/podfetcher/util/FeedItemMenuHandler.java2
2 files changed, 6 insertions, 4 deletions
diff --git a/src/de/podfetcher/feed/FeedManager.java b/src/de/podfetcher/feed/FeedManager.java
index b3d5372c0..8ed227d3e 100644
--- a/src/de/podfetcher/feed/FeedManager.java
+++ b/src/de/podfetcher/feed/FeedManager.java
@@ -415,9 +415,11 @@ public class FeedManager {
.getColumnIndex(PodDBAdapter.KEY_CONTENT_ENCODED)));
item.setPubDate(new Date(itemlistCursor.getLong(itemlistCursor
.getColumnIndex(PodDBAdapter.KEY_PUBDATE))));
- item.setMedia(adapter.getFeedMedia(itemlistCursor
- .getLong(itemlistCursor
- .getColumnIndex(PodDBAdapter.KEY_MEDIA)), item));
+ long mediaId = itemlistCursor.getLong(itemlistCursor
+ .getColumnIndex(PodDBAdapter.KEY_MEDIA));
+ if (mediaId != 0) {
+ item.setMedia(adapter.getFeedMedia(mediaId, item));
+ }
item.read = (itemlistCursor.getInt(itemlistCursor
.getColumnIndex(PodDBAdapter.KEY_READ)) > 0) ? true
: false;
diff --git a/src/de/podfetcher/util/FeedItemMenuHandler.java b/src/de/podfetcher/util/FeedItemMenuHandler.java
index 680520077..a159256ea 100644
--- a/src/de/podfetcher/util/FeedItemMenuHandler.java
+++ b/src/de/podfetcher/util/FeedItemMenuHandler.java
@@ -16,7 +16,7 @@ public class FeedItemMenuHandler {
private FeedItemMenuHandler() {
}
-
+ // TODO Fix crash when media is null
public static boolean onPrepareMenu(Menu menu, FeedItem selectedItem) {
FeedManager manager = FeedManager.getInstance();