diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-06-19 23:29:18 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-06-19 23:29:18 -0400 |
commit | 5e9c89a603dbfba35aff63ba7a55eb1e061cd63b (patch) | |
tree | c6ee0690d2613184e421765d7032ff5e5e892c42 /core | |
parent | 0eab73d85bf29df0ee7d161d370e55ddea392350 (diff) | |
parent | 3d411388e6a2ba98f84bbf74d9e34baf7cd195c1 (diff) | |
download | AntennaPod-5e9c89a603dbfba35aff63ba7a55eb1e061cd63b.zip |
Merge pull request #908 from TomHennen/fix891
Fixes 891
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java | 8 | ||||
-rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java | 8 |
2 files changed, 15 insertions, 1 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java index e454cec7d..09fe0d654 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java +++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java @@ -162,7 +162,13 @@ public class PicassoProvider { } if (bitmap == null) { - Log.wtf(TAG, "THIS SHOULD NEVER EVER HAPPEN!!"); + // this should never, happen, but sometimes it does, so fallback + // check for fallback Uri + String fallbackParam = data.uri.getQueryParameter(PicassoImageResource.PARAM_FALLBACK); + if (fallbackParam != null) { + Uri fallback = Uri.parse(fallbackParam); + bitmap = decodeStreamFromFile(data, fallback); + } } return new Result(bitmap, Picasso.LoadedFrom.DISK); diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java index 067095c32..999340900 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java @@ -414,6 +414,14 @@ public class FeedMedia extends FeedFile implements Playable { if (hasEmbeddedPicture()) { Uri.Builder builder = new Uri.Builder(); builder.scheme(SCHEME_MEDIA).encodedPath(getLocalMediaUrl()); + + if (item != null && item.getFeed() != null) { + final Uri feedImgUri = item.getFeed().getImageUri(); + if (feedImgUri != null) { + builder.appendQueryParameter(PARAM_FALLBACK, feedImgUri.toString()); + } + } + return builder.build(); } else { return item.getImageUri(); |