Merge branch 'develop'0.9.9.4

1 files changed, 16 insertions, 2 deletions

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;