From f2dd49d533475a9486ed00ba88abf30489b59519 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Tue, 23 Jun 2015 20:05:12 -0400 Subject: [PATCH] Return NULL instead of result when unable to load bitmap. There are still cases where 'bitmap' could be null. We shouldn't return a result when that's the case. Returnning null appears to be supported by Picasso. (see Picasso.NetworkRequestHandler) Fixes AntennaPod/AntennaPod#947 --- .../danoeh/antennapod/core/asynctask/PicassoProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) 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); }