summaryrefslogtreecommitdiff
path: root/core/src/main/java/de
diff options
context:
space:
mode:
authorTom Hennen <TomHennen@users.noreply.github.com>2015-06-25 18:55:28 -0400
committerTom Hennen <TomHennen@users.noreply.github.com>2015-06-25 18:55:28 -0400
commite3fe7e3fed5244c361e95653487bd1bbdc4838ae (patch)
treec7715b4fd37995eca405df0bd152cc2ddf766a51 /core/src/main/java/de
parent91a8cab9eae98c3d2341d91b1cd6aef87ff78991 (diff)
parentf2dd49d533475a9486ed00ba88abf30489b59519 (diff)
downloadAntennaPod-e3fe7e3fed5244c361e95653487bd1bbdc4838ae.zip
Merge pull request #950 from TomHennen/fix947
Return NULL instead of result when unable to load bitmap.
Diffstat (limited to 'core/src/main/java/de')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java6
1 files changed, 6 insertions, 0 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 09fe0d654..8e47a5b71 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
@@ -170,6 +170,12 @@ public class PicassoProvider {
bitmap = decodeStreamFromFile(data, fallback);
}
}
+
+ if (bitmap == null) {
+ Log.e(TAG, "Could not load media");
+ return null;
+ }
+
return new Result(bitmap, Picasso.LoadedFrom.DISK);
}