summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTom Hennen <tom.hennen@gmail.com>2015-06-17 21:27:31 -0400
committerTom Hennen <tom.hennen@gmail.com>2015-06-17 21:27:31 -0400
commitf29413f3b3c24270553fd560860228d7983d1083 (patch)
tree9b84defecc4f5f7bcf8dd266cba24523e70a266a /core
parent3d102449bc2bf78b6c5645ee738e6658c9cb155f (diff)
downloadAntennaPod-f29413f3b3c24270553fd560860228d7983d1083.zip
fix for NullPointerException in bitmap configs. Fixes AntennaPod/AntennaPod#887
Diffstat (limited to 'core')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java13
1 files changed, 12 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 4f2d5b204..e454cec7d 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
@@ -266,6 +266,11 @@ public class PicassoProvider {
@Override
public Bitmap transform(Bitmap source) {
Bitmap result = fastblur(source, BLUR_RADIUS);
+ if (result == null) {
+ // just return the original
+ // for some reason we couldn't transform it.
+ return source;
+ }
source.recycle();
return result;
}
@@ -305,8 +310,14 @@ public class PicassoProvider {
// the following line:
//
// Stack Blur Algorithm by Mario Klingemann <mario@quasimondo.com>
+ Bitmap.Config config = sentBitmap.getConfig();
+ if (config == null) {
+ // Sometimes the config can be null, in those cases
+ // we don't do a transform.
+ return null;
+ }
- Bitmap bitmap = sentBitmap.copy(sentBitmap.getConfig(), true);
+ Bitmap bitmap = sentBitmap.copy(config, true);
if (radius < 1) {
return (null);