Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #908 from TomHennen/fix891

Browse Source 
Fixes 891
This commit is contained in:
Tom Hennen 2015-06-19 23:29:18 -04:00
commit 5e9c89a603
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java
View File

@ -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);

8
core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java
View File

@ -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();