diff options
| -rw-r--r-- | app/build.gradle | 4 | ||||
| -rw-r--r-- | core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/app/build.gradle b/app/build.gradle index 40451e8ea..0f6fe06aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,14 +29,14 @@ dependencies { def getMyVersionName() { def parsedManifestXml = (new XmlSlurper()) - .parse('app/src/main/AndroidManifest.xml') + .parse("${projectDir}/src/main/AndroidManifest.xml") .declareNamespace(android:"http://schemas.android.com/apk/res/android") return parsedManifestXml.'@android:versionName' } def getMyVersionCode() { def parsedManifestXml = (new XmlSlurper()) - .parse('app/src/main/AndroidManifest.xml') + .parse("${projectDir}/src/main/AndroidManifest.xml") .declareNamespace(android:"http://schemas.android.com/apk/res/android") return parsedManifestXml.'@android:versionCode'.toInteger() } 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); |