1 files changed, 26 insertions, 18 deletions

diff --git a/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java b/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
index 3acd587af..0c4cbe685 100644
--- a/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
+++ b/src/de/danoeh/antennapod/adapter/DefaultActionButtonCallback.java
@@ -2,11 +2,15 @@ package de.danoeh.antennapod.adapter;
 
 import android.content.Context;
 import android.widget.Toast;
+
+import org.apache.commons.lang3.Validate;
+
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.dialog.DownloadRequestErrorDialogCreator;
 import de.danoeh.antennapod.feed.FeedItem;
 import de.danoeh.antennapod.feed.FeedMedia;
 import de.danoeh.antennapod.storage.DBTasks;
+import de.danoeh.antennapod.storage.DBWriter;
 import de.danoeh.antennapod.storage.DownloadRequestException;
 import de.danoeh.antennapod.storage.DownloadRequester;
 
@@ -19,31 +23,35 @@ public class DefaultActionButtonCallback implements ActionButtonCallback {
     private final Context context;
 
     public DefaultActionButtonCallback(Context context) {
-        if (context == null) throw new IllegalArgumentException("context = null");
+        Validate.notNull(context);
         this.context = context;
     }
 
     @Override
     public void onActionButtonPressed(final FeedItem item) {
-        final FeedMedia media = item.getMedia();
-        if (media == null) {
-            return;
-        }
 
-        boolean isDownloading = DownloadRequester.getInstance().isDownloadingFile(media);
-        if (!isDownloading && !media.isDownloaded()) {
-            try {
-                DBTasks.downloadFeedItems(context, item);
-                Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show();
-            } catch (DownloadRequestException e) {
-                e.printStackTrace();
-                DownloadRequestErrorDialogCreator.newRequestErrorDialog(context, e.getMessage());
+
+        if (item.hasMedia()) {
+            final FeedMedia media = item.getMedia();
+            boolean isDownloading = DownloadRequester.getInstance().isDownloadingFile(media);
+            if (!isDownloading && !media.isDownloaded()) {
+                try {
+                    DBTasks.downloadFeedItems(context, item);
+                    Toast.makeText(context, R.string.status_downloading_label, Toast.LENGTH_SHORT).show();
+                } catch (DownloadRequestException e) {
+                    e.printStackTrace();
+                    DownloadRequestErrorDialogCreator.newRequestErrorDialog(context, e.getMessage());
+                }
+            } else if (isDownloading) {
+                DownloadRequester.getInstance().cancelDownload(context, media);
+                Toast.makeText(context, R.string.download_cancelled_msg, Toast.LENGTH_SHORT).show();
+            } else { // media is downloaded
+                DBTasks.playMedia(context, media, true, true, false);
+            }
+        } else {
+            if (!item.isRead()) {
+                DBWriter.markItemRead(context, item, true, true);
             }
-        } else if (isDownloading) {
-            DownloadRequester.getInstance().cancelDownload(context, media);
-            Toast.makeText(context, R.string.download_cancelled_msg, Toast.LENGTH_SHORT).show();
-        } else { // media is downloaded
-            DBTasks.playMedia(context, media, true, true, false);
         }
     }
 }