2 files changed, 65 insertions, 35 deletions

diff --git a/src/de/danoeh/antennapod/feed/FeedComponent.java b/src/de/danoeh/antennapod/feed/FeedComponent.java
index 66a2f9cc5..48b243770 100644
--- a/src/de/danoeh/antennapod/feed/FeedComponent.java
+++ b/src/de/danoeh/antennapod/feed/FeedComponent.java
@@ -2,43 +2,43 @@ package de.danoeh.antennapod.feed;
 
 /**
  * Represents every possible component of a feed
- * @author daniel
  *
+ * @author daniel
  */
 public abstract class FeedComponent {
 
-	protected long id;
-
-	public FeedComponent() {
-		super();
-	}
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-	
-	/**
-	 * Update this FeedComponent's attributes with the attributes from another
-	 * FeedComponent. This method should only update attributes which where read from
-	 * the feed.
-	 */
-	public void updateFromOther(FeedComponent other) {
-	}
-
-	/**
-	 * Compare's this FeedComponent's attribute values with another FeedComponent's
-	 * attribute values. This method will only compare attributes which were
-	 * read from the feed.
-	 * 
-	 * @return true if attribute values are different, false otherwise
-	 */
-	public boolean compareWithOther(FeedComponent other) {
-		return false;
-	}
+    protected long id;
+
+    public FeedComponent() {
+        super();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    /**
+     * Update this FeedComponent's attributes with the attributes from another
+     * FeedComponent. This method should only update attributes which where read from
+     * the feed.
+     */
+    public void updateFromOther(FeedComponent other) {
+    }
+
+    /**
+     * Compare's this FeedComponent's attribute values with another FeedComponent's
+     * attribute values. This method will only compare attributes which were
+     * read from the feed.
+     *
+     * @return true if attribute values are different, false otherwise
+     */
+    public boolean compareWithOther(FeedComponent other) {
+        return false;
+    }
 
 
     /**
@@ -47,4 +47,20 @@ public abstract class FeedComponent {
      */
     public abstract String getHumanReadableIdentifier();
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        FeedComponent that = (FeedComponent) o;
+
+        if (id != that.id) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        return (int) (id ^ (id >>> 32));
+    }
 }
\ No newline at end of file
diff --git a/src/de/danoeh/antennapod/feed/FeedMedia.java b/src/de/danoeh/antennapod/feed/FeedMedia.java
index f555654d0..9298ebe8a 100644
--- a/src/de/danoeh/antennapod/feed/FeedMedia.java
+++ b/src/de/danoeh/antennapod/feed/FeedMedia.java
@@ -386,9 +386,23 @@ public class FeedMedia extends FeedFile implements Playable {
 
     @Override
     public Uri getImageUri() {
+        final Uri feedImgUri = getFeedImageUri();
+
         if (localFileAvailable()) {
-            return new Uri.Builder().scheme(SCHEME_MEDIA).encodedPath(getLocalMediaUrl()).build();
-        } else if (item != null && item.getFeed() != null) {
+            Uri.Builder builder = new Uri.Builder();
+            builder.scheme(SCHEME_MEDIA)
+                    .encodedPath(getLocalMediaUrl());
+            if (feedImgUri != null) {
+                builder.appendQueryParameter(PARAM_FALLBACK, feedImgUri.toString());
+            }
+            return builder.build();
+        } else {
+            return feedImgUri;
+        }
+    }
+
+    private Uri getFeedImageUri() {
+        if (item != null && item.getFeed() != null) {
             return item.getFeed().getImageUri();
         } else {
             return null;