Merge branch 'develop'

2 files changed, 5 insertions, 14 deletions

diff --git a/core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java b/core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java
index 305f93e43..88da6a0ec 100644
--- a/core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java
+++ b/core/src/play/java/de/danoeh/antennapod/core/cast/CastUtils.java
@@ -13,7 +13,6 @@ import java.util.Calendar;
 import java.util.List;
 
 import de.danoeh.antennapod.core.feed.Feed;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.storage.DBReader;
@@ -99,9 +98,9 @@ public class CastUtils {
             if (subtitle != null) {
                 metadata.putString(MediaMetadata.KEY_SUBTITLE, subtitle);
             }
-            FeedImage image = feedItem.getImage();
-            if (image != null && !TextUtils.isEmpty(image.getDownload_url())) {
-                metadata.addImage(new WebImage(Uri.parse(image.getDownload_url())));
+
+            if (!TextUtils.isEmpty(feedItem.getImageUrl())) {
+                metadata.addImage(new WebImage(Uri.parse(feedItem.getImageUrl())));
             }
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(media.getItem().getPubDate());
diff --git a/core/src/play/java/de/danoeh/antennapod/core/cast/RemoteMedia.java b/core/src/play/java/de/danoeh/antennapod/core/cast/RemoteMedia.java
index a3ac87062..c6524e868 100644
--- a/core/src/play/java/de/danoeh/antennapod/core/cast/RemoteMedia.java
+++ b/core/src/play/java/de/danoeh/antennapod/core/cast/RemoteMedia.java
@@ -12,6 +12,8 @@ import com.google.android.gms.cast.MediaInfo;
 import com.google.android.gms.cast.MediaMetadata;
 import com.google.android.gms.common.images.WebImage;
 
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -26,8 +28,6 @@ import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.ChapterUtils;
 import de.danoeh.antennapod.core.util.playback.Playable;
 
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
 /**
  * Playable implementation for media on a Cast Device for which a local version of
  * {@link de.danoeh.antennapod.core.feed.FeedMedia} hasn't been found.
@@ -131,14 +131,6 @@ public class RemoteMedia implements Playable {
         return feedUrl;
     }
 
-    public FeedMedia lookForFeedMedia() {
-        FeedItem feedItem = DBReader.getFeedItem(feedUrl, itemIdentifier);
-        if (feedItem == null) {
-            return null;
-        }
-        return feedItem.getMedia();
-    }
-
     @Override
     public void writeToPreferences(SharedPreferences.Editor prefEditor) {
         //it seems pointless to do it, since the session should be kept by the remote device.