Merge pull request #1043 from mfietz/glide

Glide

23 files changed, 537 insertions, 686 deletions

diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
index 5d2d5d441..f91d4557e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/FlattrClickWorker.java
@@ -90,7 +90,7 @@ public class FlattrClickWorker extends AsyncTask<Void, Integer, FlattrClickWorke
             return ExitCode.NO_TOKEN;
         }
 
-        if (!NetworkUtils.networkAvailable(context)) {
+        if (!NetworkUtils.networkAvailable()) {
             return ExitCode.NO_NETWORK;
         }
 
diff --git a/core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoImageResource.java b/core/src/main/java/de/danoeh/antennapod/core/asynctask/ImageResource.java
index c0d8049db..edd69f15b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoImageResource.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/asynctask/ImageResource.java
@@ -6,7 +6,7 @@ import android.net.Uri;
  * Classes that implement this interface provide access to an image resource that can
  * be loaded by the Picasso library.
  */
-public interface PicassoImageResource {
+public interface ImageResource {
 
     /**
      * This scheme should be used by PicassoImageResources to
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
deleted file mode 100644
index 8e47a5b71..000000000
--- a/core/src/main/java/de/danoeh/antennapod/core/asynctask/PicassoProvider.java
+++ /dev/null
@@ -1,533 +0,0 @@
-package de.danoeh.antennapod.core.asynctask;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.media.MediaMetadataRetriever;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-
-import com.squareup.okhttp.Interceptor;
-import com.squareup.okhttp.OkHttpClient;
-import com.squareup.okhttp.Response;
-import com.squareup.picasso.Cache;
-import com.squareup.picasso.LruCache;
-import com.squareup.picasso.OkHttpDownloader;
-import com.squareup.picasso.Picasso;
-import com.squareup.picasso.Request;
-import com.squareup.picasso.RequestHandler;
-import com.squareup.picasso.Transformation;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.HttpURLConnection;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import de.danoeh.antennapod.core.service.download.HttpDownloader;
-import de.danoeh.antennapod.core.storage.DBReader;
-
-/**
- * Provides access to Picasso instances.
- */
-public class PicassoProvider {
-
-    private static final String TAG = "PicassoProvider";
-
-    private static final boolean DEBUG = false;
-
-    private static ExecutorService executorService;
-    private static Cache memoryCache;
-
-    private static synchronized ExecutorService getExecutorService() {
-        if (executorService == null) {
-            executorService = Executors.newFixedThreadPool(3);
-        }
-        return executorService;
-    }
-
-    private static synchronized Cache getMemoryCache(Context context) {
-        if (memoryCache == null) {
-            memoryCache = new LruCache(context);
-        }
-        return memoryCache;
-    }
-
-    private static volatile boolean picassoSetup = false;
-
-    public static synchronized void setupPicassoInstance(Context appContext) {
-        if (picassoSetup) {
-            return;
-        }
-        OkHttpClient client = new OkHttpClient();
-        client.interceptors().add(new BasicAuthenticationInterceptor(appContext));
-        Picasso picasso = new Picasso.Builder(appContext)
-                .indicatorsEnabled(DEBUG)
-                .loggingEnabled(DEBUG)
-                .downloader(new OkHttpDownloader(client))
-                .addRequestHandler(new MediaRequestHandler(appContext))
-                .executor(getExecutorService())
-                .memoryCache(getMemoryCache(appContext))
-                .listener(new Picasso.Listener() {
-                    @Override
-                    public void onImageLoadFailed(Picasso picasso, Uri uri, Exception e) {
-                        Log.e(TAG, "Failed to load Uri:" + uri.toString());
-                        e.printStackTrace();
-                    }
-                })
-                .build();
-        Picasso.setSingletonInstance(picasso);
-        picassoSetup = true;
-    }
-
-    private static class BasicAuthenticationInterceptor implements Interceptor {
-
-        private final Context context;
-
-        public BasicAuthenticationInterceptor(Context context) {
-            this.context = context;
-        }
-
-        @Override
-        public Response intercept(Chain chain) throws IOException {
-            com.squareup.okhttp.Request request = chain.request();
-            String url = request.urlString();
-            String authentication = DBReader.getImageAuthentication(context, url);
-
-            if(TextUtils.isEmpty(authentication)) {
-                Log.d(TAG, "no credentials for '" + url + "'");
-                return chain.proceed(request);
-            }
-
-            // add authentication
-            String[] auth = authentication.split(":");
-            String credentials = HttpDownloader.encodeCredentials(auth[0], auth[1], "ISO-8859-1");
-            com.squareup.okhttp.Request newRequest = request
-                    .newBuilder()
-                    .addHeader("Authorization", credentials)
-                    .build();
-            Log.d(TAG, "Basic authentication with ISO-8859-1 encoding");
-            Response response = chain.proceed(newRequest);
-            if (!response.isSuccessful() && response.code() == HttpURLConnection.HTTP_UNAUTHORIZED) {
-                credentials = HttpDownloader.encodeCredentials(auth[0], auth[1], "UTF-8");
-                newRequest = request
-                        .newBuilder()
-                        .addHeader("Authorization", credentials)
-                        .build();
-                Log.d(TAG, "Basic authentication with UTF-8 encoding");
-                return chain.proceed(newRequest);
-            } else {
-                return response;
-            }
-        }
-    }
-
-    private static class MediaRequestHandler extends RequestHandler {
-
-        final Context context;
-
-        public MediaRequestHandler(Context context) {
-            super();
-            this.context = context;
-        }
-
-        @Override
-        public boolean canHandleRequest(Request data) {
-            return StringUtils.equals(data.uri.getScheme(), PicassoImageResource.SCHEME_MEDIA);
-        }
-
-        @Override
-        public Result load(Request data, int networkPolicy) throws IOException {
-            Bitmap bitmap = null;
-            MediaMetadataRetriever mmr = null;
-            try {
-                mmr = new MediaMetadataRetriever();
-                mmr.setDataSource(data.uri.getPath());
-                byte[] image = mmr.getEmbeddedPicture();
-                if (image != null) {
-                    bitmap = decodeStreamFromByteArray(data, image);
-                }
-            } catch (RuntimeException e) {
-                Log.e(TAG, "Failed to decode image in media file", e);
-            } finally {
-                if (mmr != null) {
-                    mmr.release();
-                }
-            }
-
-            if (bitmap == null) {
-                // 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);
-                }
-            }
-
-            if (bitmap == null) {
-                Log.e(TAG, "Could not load media");
-                return null;
-            }
-
-            return new Result(bitmap, Picasso.LoadedFrom.DISK);
-
-        }
-
-        /* Copied/Adapted from Picasso RequestHandler classes  */
-
-        private Bitmap decodeStreamFromByteArray(Request data, byte[] bytes) throws IOException {
-
-            final BitmapFactory.Options options = createBitmapOptions(data);
-            final ByteArrayInputStream in = new ByteArrayInputStream(bytes);
-            in.mark(0);
-            if (requiresInSampleSize(options)) {
-                try {
-                    BitmapFactory.decodeStream(in, null, options);
-                } finally {
-                    in.reset();
-                }
-                calculateInSampleSize(data.targetWidth, data.targetHeight, options, data);
-            }
-            try {
-                return BitmapFactory.decodeStream(in, null, options);
-            } finally {
-                IOUtils.closeQuietly(in);
-            }
-        }
-
-        private Bitmap decodeStreamFromFile(Request data, Uri uri) throws IOException {
-            ContentResolver contentResolver = context.getContentResolver();
-            final BitmapFactory.Options options = createBitmapOptions(data);
-            if (requiresInSampleSize(options)) {
-                InputStream is = null;
-                try {
-                    is = contentResolver.openInputStream(uri);
-                    BitmapFactory.decodeStream(is, null, options);
-                } finally {
-                    IOUtils.closeQuietly(is);
-                }
-                calculateInSampleSize(data.targetWidth, data.targetHeight, options, data);
-            }
-            InputStream is = contentResolver.openInputStream(uri);
-            try {
-                return BitmapFactory.decodeStream(is, null, options);
-            } finally {
-                IOUtils.closeQuietly(is);
-            }
-        }
-
-        private BitmapFactory.Options createBitmapOptions(Request data) {
-            final boolean justBounds = data.hasSize();
-            final boolean hasConfig = data.config != null;
-            BitmapFactory.Options options = null;
-            if (justBounds || hasConfig) {
-                options = new BitmapFactory.Options();
-                options.inJustDecodeBounds = justBounds;
-                if (hasConfig) {
-                    options.inPreferredConfig = data.config;
-                }
-            }
-            return options;
-        }
-
-        private static boolean requiresInSampleSize(BitmapFactory.Options options) {
-            return options != null && options.inJustDecodeBounds;
-        }
-
-        private static void calculateInSampleSize(int reqWidth, int reqHeight, BitmapFactory.Options options,
-                                                  Request request) {
-            calculateInSampleSize(reqWidth, reqHeight, options.outWidth, options.outHeight, options,
-                    request);
-        }
-
-        private static void calculateInSampleSize(int reqWidth, int reqHeight, int width, int height,
-                                                  BitmapFactory.Options options, Request request) {
-            int sampleSize = 1;
-            if (height > reqHeight || width > reqWidth) {
-                final int heightRatio;
-                final int widthRatio;
-                if (reqHeight == 0) {
-                    sampleSize = (int) Math.floor((float) width / (float) reqWidth);
-                } else if (reqWidth == 0) {
-                    sampleSize = (int) Math.floor((float) height / (float) reqHeight);
-                } else {
-                    heightRatio = (int) Math.floor((float) height / (float) reqHeight);
-                    widthRatio = (int) Math.floor((float) width / (float) reqWidth);
-                    sampleSize = request.centerInside
-                            ? Math.max(heightRatio, widthRatio)
-                            : Math.min(heightRatio, widthRatio);
-                }
-            }
-            options.inSampleSize = sampleSize;
-            options.inJustDecodeBounds = false;
-        }
-    }
-
-    public static final int BLUR_RADIUS = 1;
-    public static final int BLUR_IMAGE_SIZE = 100;
-    public static final String BLUR_KEY = "blur";
-
-    public static final Transformation blurTransformation = new Transformation() {
-        @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;
-        }
-
-        @Override
-        public String key() {
-            return BLUR_KEY;
-        }
-    };
-
-    public static Bitmap fastblur(Bitmap sentBitmap, int radius) {
-
-        // Stack Blur v1.0 from
-        // http://www.quasimondo.com/StackBlurForCanvas/StackBlurDemo.html
-        //
-        // Java Author: Mario Klingemann <mario at quasimondo.com>
-        // http://incubator.quasimondo.com
-        // created Feburary 29, 2004
-        // Android port : Yahel Bouaziz <yahel at kayenko.com>
-        // http://www.kayenko.com
-        // ported april 5th, 2012
-
-        // This is a compromise between Gaussian Blur and Box blur
-        // It creates much better looking blurs than Box Blur, but is
-        // 7x faster than my Gaussian Blur implementation.
-        //
-        // I called it Stack Blur because this describes best how this
-        // filter works internally: it creates a kind of moving stack
-        // of colors whilst scanning through the image. Thereby it
-        // just has to add one new block of color to the right side
-        // of the stack and remove the leftmost color. The remaining
-        // colors on the topmost layer of the stack are either added on
-        // or reduced by one, depending on if they are on the right or
-        // on the left side of the stack.
-        //
-        // If you are using this algorithm in your code please add
-        // 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(config, true);
-
-        if (radius < 1) {
-            return (null);
-        }
-
-        int w = bitmap.getWidth();
-        int h = bitmap.getHeight();
-
-        int[] pix = new int[w * h];
-        Log.e("pix", w + " " + h + " " + pix.length);
-        bitmap.getPixels(pix, 0, w, 0, 0, w, h);
-
-        int wm = w - 1;
-        int hm = h - 1;
-        int wh = w * h;
-        int div = radius + radius + 1;
-
-        int r[] = new int[wh];
-        int g[] = new int[wh];
-        int b[] = new int[wh];
-        int rsum, gsum, bsum, x, y, i, p, yp, yi, yw;
-        int vmin[] = new int[Math.max(w, h)];
-
-        int divsum = (div + 1) >> 1;
-        divsum *= divsum;
-        int dv[] = new int[256 * divsum];
-        for (i = 0; i < 256 * divsum; i++) {
-            dv[i] = (i / divsum);
-        }
-
-        yw = yi = 0;
-
-        int[][] stack = new int[div][3];
-        int stackpointer;
-        int stackstart;
-        int[] sir;
-        int rbs;
-        int r1 = radius + 1;
-        int routsum, goutsum, boutsum;
-        int rinsum, ginsum, binsum;
-
-        for (y = 0; y < h; y++) {
-            rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
-            for (i = -radius; i <= radius; i++) {
-                p = pix[yi + Math.min(wm, Math.max(i, 0))];
-                sir = stack[i + radius];
-                sir[0] = (p & 0xff0000) >> 16;
-                sir[1] = (p & 0x00ff00) >> 8;
-                sir[2] = (p & 0x0000ff);
-                rbs = r1 - Math.abs(i);
-                rsum += sir[0] * rbs;
-                gsum += sir[1] * rbs;
-                bsum += sir[2] * rbs;
-                if (i > 0) {
-                    rinsum += sir[0];
-                    ginsum += sir[1];
-                    binsum += sir[2];
-                } else {
-                    routsum += sir[0];
-                    goutsum += sir[1];
-                    boutsum += sir[2];
-                }
-            }
-            stackpointer = radius;
-
-            for (x = 0; x < w; x++) {
-
-                r[yi] = dv[rsum];
-                g[yi] = dv[gsum];
-                b[yi] = dv[bsum];
-
-                rsum -= routsum;
-                gsum -= goutsum;
-                bsum -= boutsum;
-
-                stackstart = stackpointer - radius + div;
-                sir = stack[stackstart % div];
-
-                routsum -= sir[0];
-                goutsum -= sir[1];
-                boutsum -= sir[2];
-
-                if (y == 0) {
-                    vmin[x] = Math.min(x + radius + 1, wm);
-                }
-                p = pix[yw + vmin[x]];
-
-                sir[0] = (p & 0xff0000) >> 16;
-                sir[1] = (p & 0x00ff00) >> 8;
-                sir[2] = (p & 0x0000ff);
-
-                rinsum += sir[0];
-                ginsum += sir[1];
-                binsum += sir[2];
-
-                rsum += rinsum;
-                gsum += ginsum;
-                bsum += binsum;
-
-                stackpointer = (stackpointer + 1) % div;
-                sir = stack[(stackpointer) % div];
-
-                routsum += sir[0];
-                goutsum += sir[1];
-                boutsum += sir[2];
-
-                rinsum -= sir[0];
-                ginsum -= sir[1];
-                binsum -= sir[2];
-
-                yi++;
-            }
-            yw += w;
-        }
-        for (x = 0; x < w; x++) {
-            rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
-            yp = -radius * w;
-            for (i = -radius; i <= radius; i++) {
-                yi = Math.max(0, yp) + x;
-
-                sir = stack[i + radius];
-
-                sir[0] = r[yi];
-                sir[1] = g[yi];
-                sir[2] = b[yi];
-
-                rbs = r1 - Math.abs(i);
-
-                rsum += r[yi] * rbs;
-                gsum += g[yi] * rbs;
-                bsum += b[yi] * rbs;
-
-                if (i > 0) {
-                    rinsum += sir[0];
-                    ginsum += sir[1];
-                    binsum += sir[2];
-                } else {
-                    routsum += sir[0];
-                    goutsum += sir[1];
-                    boutsum += sir[2];
-                }
-
-                if (i < hm) {
-                    yp += w;
-                }
-            }
-            yi = x;
-            stackpointer = radius;
-            for (y = 0; y < h; y++) {
-                // Preserve alpha channel: ( 0xff000000 & pix[yi] )
-                pix[yi] = (0xff000000 & pix[yi]) | (dv[rsum] << 16) | (dv[gsum] << 8) | dv[bsum];
-
-                rsum -= routsum;
-                gsum -= goutsum;
-                bsum -= boutsum;
-
-                stackstart = stackpointer - radius + div;
-                sir = stack[stackstart % div];
-
-                routsum -= sir[0];
-                goutsum -= sir[1];
-                boutsum -= sir[2];
-
-                if (x == 0) {
-                    vmin[y] = Math.min(y + r1, hm) * w;
-                }
-                p = x + vmin[y];
-
-                sir[0] = r[p];
-                sir[1] = g[p];
-                sir[2] = b[p];
-
-                rinsum += sir[0];
-                ginsum += sir[1];
-                binsum += sir[2];
-
-                rsum += rinsum;
-                gsum += ginsum;
-                bsum += binsum;
-
-                stackpointer = (stackpointer + 1) % div;
-                sir = stack[stackpointer];
-
-                routsum += sir[0];
-                goutsum += sir[1];
-                boutsum += sir[2];
-
-                rinsum -= sir[0];
-                ginsum -= sir[1];
-                binsum -= sir[2];
-
-                yi += w;
-            }
-        }
-
-        Log.e("pix", w + " " + h + " " + pix.length);
-        bitmap.setPixels(pix, 0, w, 0, 0, w, h);
-
-        return (bitmap);
-    }
-}
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
index f6322d6f4..2a483ca9b 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/Feed.java
@@ -10,7 +10,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
+import de.danoeh.antennapod.core.asynctask.ImageResource;
 import de.danoeh.antennapod.core.storage.DBWriter;
 import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
 import de.danoeh.antennapod.core.util.flattr.FlattrThing;
@@ -20,7 +20,7 @@ import de.danoeh.antennapod.core.util.flattr.FlattrThing;
  *
  * @author daniel
  */
-public class Feed extends FeedFile implements FlattrThing, PicassoImageResource {
+public class Feed extends FeedFile implements FlattrThing, ImageResource {
     public static final int FEEDFILETYPE_FEED = 0;
     public static final String TYPE_RSS2 = "rss";
     public static final String TYPE_RSS091 = "rss";
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
index c6f24367e..f77a78721 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedImage.java
@@ -4,10 +4,10 @@ import android.net.Uri;
 
 import java.io.File;
 
-import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
+import de.danoeh.antennapod.core.asynctask.ImageResource;
 
 
-public class FeedImage extends FeedFile implements PicassoImageResource {
+public class FeedImage extends FeedFile implements ImageResource {
 	public static final int FEEDFILETYPE_FEEDIMAGE = 1;
 
 	protected String title;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
index 12b9a7db5..9229172f0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedItem.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.concurrent.Callable;
 
 import de.danoeh.antennapod.core.ClientConfig;
-import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
+import de.danoeh.antennapod.core.asynctask.ImageResource;
 import de.danoeh.antennapod.core.storage.DBReader;
 import de.danoeh.antennapod.core.util.ShownotesProvider;
 import de.danoeh.antennapod.core.util.flattr.FlattrStatus;
@@ -21,7 +21,7 @@ import de.danoeh.antennapod.core.util.flattr.FlattrThing;
  *
  * @author daniel
  */
-public class FeedItem extends FeedComponent implements ShownotesProvider, FlattrThing, PicassoImageResource {
+public class FeedItem extends FeedComponent implements ShownotesProvider, FlattrThing, ImageResource {
 
     /**
      * The id/guid that can be found in the rss/atom feed. Might not be set.
@@ -333,7 +333,7 @@ public class FeedItem extends FeedComponent implements ShownotesProvider, Flattr
     public Uri getImageUri() {
         if(media != null && media.hasEmbeddedPicture()) {
             return media.getImageUri();
-        } else if (hasItemImageDownloaded()) {
+        } else if (image != null) {
            return image.getImageUri();
         } else if (feed != null) {
             return feed.getImageUri();
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
new file mode 100644
index 000000000..0baff9723
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
@@ -0,0 +1,33 @@
+package de.danoeh.antennapod.core.glide;
+
+import android.content.Context;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.GlideBuilder;
+import com.bumptech.glide.load.DecodeFormat;
+import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
+import com.bumptech.glide.load.model.GlideUrl;
+import com.bumptech.glide.module.GlideModule;
+
+import java.io.InputStream;
+
+import de.danoeh.antennapod.core.preferences.UserPreferences;
+
+/**
+ * {@see com.bumptech.glide.integration.okhttp.OkHttpGlideModule}
+ */
+public class ApGlideModule implements GlideModule {
+
+    @Override
+    public void applyOptions(Context context, GlideBuilder builder) {
+        builder.setDecodeFormat(DecodeFormat.PREFER_ARGB_8888);
+        builder.setDiskCache(new InternalCacheDiskCacheFactory(context,
+                UserPreferences.getImageCacheSize()));
+    }
+
+    @Override
+    public void registerComponents(Context context, Glide glide) {
+        glide.register(GlideUrl.class, InputStream.class, new ApOkHttpUrlLoader.Factory());
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
new file mode 100644
index 000000000..433ba8db4
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
@@ -0,0 +1,140 @@
+package de.danoeh.antennapod.core.glide;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.bumptech.glide.integration.okhttp.OkHttpStreamFetcher;
+import com.bumptech.glide.load.data.DataFetcher;
+import com.bumptech.glide.load.model.GenericLoaderFactory;
+import com.bumptech.glide.load.model.GlideUrl;
+import com.bumptech.glide.load.model.ModelLoader;
+import com.bumptech.glide.load.model.ModelLoaderFactory;
+import com.squareup.okhttp.Interceptor;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Response;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+
+import de.danoeh.antennapod.core.ClientConfig;
+import de.danoeh.antennapod.core.service.download.HttpDownloader;
+import de.danoeh.antennapod.core.storage.DBReader;
+import de.danoeh.antennapod.core.util.NetworkUtils;
+
+/**
+ * @see com.bumptech.glide.integration.okhttp.OkHttpUrlLoader
+ */
+public class ApOkHttpUrlLoader implements ModelLoader<GlideUrl, InputStream> {
+
+    private static final String TAG = ApOkHttpUrlLoader.class.getSimpleName();
+
+    /**
+     * The default factory for {@link ApOkHttpUrlLoader}s.
+     */
+    public static class Factory implements ModelLoaderFactory<GlideUrl, InputStream> {
+
+        private static volatile OkHttpClient internalClient;
+        private OkHttpClient client;
+
+        private static OkHttpClient getInternalClient() {
+            if (internalClient == null) {
+                synchronized (Factory.class) {
+                    if (internalClient == null) {
+                        internalClient = new OkHttpClient();
+                        internalClient.interceptors().add(new NetworkAllowanceInterceptor());
+                        internalClient.interceptors().add(new BasicAuthenticationInterceptor());
+                    }
+                }
+            }
+            return internalClient;
+        }
+
+        /**
+         * Constructor for a new Factory that runs requests using a static singleton client.
+         */
+        public Factory() {
+            this(getInternalClient());
+        }
+
+        /**
+         * Constructor for a new Factory that runs requests using given client.
+         */
+        public Factory(OkHttpClient client) {
+            this.client = client;
+        }
+
+        @Override
+        public ModelLoader<GlideUrl, InputStream> build(Context context, GenericLoaderFactory factories) {
+            return new ApOkHttpUrlLoader(client);
+        }
+
+        @Override
+        public void teardown() {
+            // Do nothing, this instance doesn't own the client.
+        }
+    }
+
+    private final OkHttpClient client;
+
+    public ApOkHttpUrlLoader(OkHttpClient client) {
+        this.client = client;
+    }
+
+    @Override
+    public DataFetcher<InputStream> getResourceFetcher(GlideUrl model, int width, int height) {
+        return new OkHttpStreamFetcher(client, model);
+    }
+
+    private static class NetworkAllowanceInterceptor implements Interceptor {
+
+        @Override
+        public Response intercept(Chain chain) throws IOException {
+            if (NetworkUtils.isDownloadAllowed()) {
+                return chain.proceed(chain.request());
+            } else {
+                return null;
+            }
+        }
+
+    }
+
+    private static class BasicAuthenticationInterceptor implements Interceptor {
+
+        @Override
+        public Response intercept(Chain chain) throws IOException {
+            com.squareup.okhttp.Request request = chain.request();
+            String url = request.urlString();
+            Context context = ClientConfig.applicationCallbacks.getApplicationInstance();
+            String authentication = DBReader.getImageAuthentication(context, url);
+
+            if(TextUtils.isEmpty(authentication)) {
+                Log.d(TAG, "no credentials for '" + url + "'");
+                return chain.proceed(request);
+            }
+
+            // add authentication
+            String[] auth = authentication.split(":");
+            String credentials = HttpDownloader.encodeCredentials(auth[0], auth[1], "ISO-8859-1");
+            com.squareup.okhttp.Request newRequest = request
+                    .newBuilder()
+                    .addHeader("Authorization", credentials)
+                    .build();
+            Log.d(TAG, "Basic authentication with ISO-8859-1 encoding");
+            Response response = chain.proceed(newRequest);
+            if (!response.isSuccessful() && response.code() == HttpURLConnection.HTTP_UNAUTHORIZED) {
+                credentials = HttpDownloader.encodeCredentials(auth[0], auth[1], "UTF-8");
+                newRequest = request
+                        .newBuilder()
+                        .addHeader("Authorization", credentials)
+                        .build();
+                Log.d(TAG, "Basic authentication with UTF-8 encoding");
+                return chain.proceed(newRequest);
+            } else {
+                return response;
+            }
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java b/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
new file mode 100644
index 000000000..ee58c2f39
--- /dev/null
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
@@ -0,0 +1,267 @@
+package de.danoeh.antennapod.core.glide;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.media.ThumbnailUtils;
+import android.util.Log;
+
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
+import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+
+public class FastBlurTransformation extends BitmapTransformation {
+
+    private static final String TAG = FastBlurTransformation.class.getSimpleName();
+
+    private static final int STACK_BLUR_RADIUS = 1;
+    private static final int BLUR_IMAGE_WIDTH = 150;
+
+    public FastBlurTransformation(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected Bitmap transform(BitmapPool pool, Bitmap source,
+                               int outWidth, int outHeight) {
+        int targetWidth = BLUR_IMAGE_WIDTH;
+        int targetHeight = (int) (1.0 * outHeight * targetWidth / outWidth);
+        Bitmap resized = ThumbnailUtils.extractThumbnail(source, targetWidth, targetHeight);
+        Bitmap result = fastBlur(resized, STACK_BLUR_RADIUS);
+        if (result == null) {
+            Log.w(TAG, "result was null");
+            return source;
+        }
+        return result;
+    }
+
+    @Override
+    public String getId() {
+        return "FastBlurTransformation[width=" + BLUR_IMAGE_WIDTH + "px,radius=" + STACK_BLUR_RADIUS +"]";
+    }
+
+    private static Bitmap fastBlur(Bitmap bitmap, int radius) {
+
+        // Stack Blur v1.0 from
+        // http://www.quasimondo.com/StackBlurForCanvas/StackBlurDemo.html
+        //
+        // Java Author: Mario Klingemann <mario at quasimondo.com>
+        // http://incubator.quasimondo.com
+        // created Feburary 29, 2004
+        // Android port : Yahel Bouaziz <yahel at kayenko.com>
+        // http://www.kayenko.com
+        // ported april 5th, 2012
+
+        // This is a compromise between Gaussian Blur and Box blur
+        // It creates much better looking blurs than Box Blur, but is
+        // 7x faster than my Gaussian Blur implementation.
+        //
+        // I called it Stack Blur because this describes best how this
+        // filter works internally: it creates a kind of moving stack
+        // of colors whilst scanning through the image. Thereby it
+        // just has to add one new block of color to the right side
+        // of the stack and remove the leftmost color. The remaining
+        // colors on the topmost layer of the stack are either added on
+        // or reduced by one, depending on if they are on the right or
+        // on the left side of the stack.
+        //
+        // If you are using this algorithm in your code please add
+        // the following line:
+        //
+        // Stack Blur Algorithm by Mario Klingemann <mario@quasimondo.com>
+
+        if (radius < 1) {
+            return null;
+        }
+
+        int w = bitmap.getWidth();
+        int h = bitmap.getHeight();
+
+        int[] pix = new int[w * h];
+        bitmap.getPixels(pix, 0, w, 0, 0, w, h);
+
+        int wm = w - 1;
+        int hm = h - 1;
+        int wh = w * h;
+        int div = radius + radius + 1;
+
+        int r[] = new int[wh];
+        int g[] = new int[wh];
+        int b[] = new int[wh];
+        int rsum, gsum, bsum, x, y, i, p, yp, yi, yw;
+        int vmin[] = new int[Math.max(w, h)];
+
+        int divsum = (div + 1) >> 1;
+        divsum *= divsum;
+        int dv[] = new int[256 * divsum];
+        for (i = 0; i < 256 * divsum; i++) {
+            dv[i] = (i / divsum);
+        }
+
+        yw = yi = 0;
+
+        int[][] stack = new int[div][3];
+        int stackpointer;
+        int stackstart;
+        int[] sir;
+        int rbs;
+        int r1 = radius + 1;
+        int routsum, goutsum, boutsum;
+        int rinsum, ginsum, binsum;
+
+        for (y = 0; y < h; y++) {
+            rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
+            for (i = -radius; i <= radius; i++) {
+                p = pix[yi + Math.min(wm, Math.max(i, 0))];
+                sir = stack[i + radius];
+                sir[0] = (p & 0xff0000) >> 16;
+                sir[1] = (p & 0x00ff00) >> 8;
+                sir[2] = (p & 0x0000ff);
+                rbs = r1 - Math.abs(i);
+                rsum += sir[0] * rbs;
+                gsum += sir[1] * rbs;
+                bsum += sir[2] * rbs;
+                if (i > 0) {
+                    rinsum += sir[0];
+                    ginsum += sir[1];
+                    binsum += sir[2];
+                } else {
+                    routsum += sir[0];
+                    goutsum += sir[1];
+                    boutsum += sir[2];
+                }
+            }
+            stackpointer = radius;
+
+            for (x = 0; x < w; x++) {
+
+                r[yi] = dv[rsum];
+                g[yi] = dv[gsum];
+                b[yi] = dv[bsum];
+
+                rsum -= routsum;
+                gsum -= goutsum;
+                bsum -= boutsum;
+
+                stackstart = stackpointer - radius + div;
+                sir = stack[stackstart % div];
+
+                routsum -= sir[0];
+                goutsum -= sir[1];
+                boutsum -= sir[2];
+
+                if (y == 0) {
+                    vmin[x] = Math.min(x + radius + 1, wm);
+                }
+                p = pix[yw + vmin[x]];
+
+                sir[0] = (p & 0xff0000) >> 16;
+                sir[1] = (p & 0x00ff00) >> 8;
+                sir[2] = (p & 0x0000ff);
+
+                rinsum += sir[0];
+                ginsum += sir[1];
+                binsum += sir[2];
+
+                rsum += rinsum;
+                gsum += ginsum;
+                bsum += binsum;
+
+                stackpointer = (stackpointer + 1) % div;
+                sir = stack[(stackpointer) % div];
+
+                routsum += sir[0];
+                goutsum += sir[1];
+                boutsum += sir[2];
+
+                rinsum -= sir[0];
+                ginsum -= sir[1];
+                binsum -= sir[2];
+
+                yi++;
+            }
+            yw += w;
+        }
+        for (x = 0; x < w; x++) {
+            rinsum = ginsum = binsum = routsum = goutsum = boutsum = rsum = gsum = bsum = 0;
+            yp = -radius * w;
+            for (i = -radius; i <= radius; i++) {
+                yi = Math.max(0, yp) + x;
+
+                sir = stack[i + radius];
+
+                sir[0] = r[yi];
+                sir[1] = g[yi];
+                sir[2] = b[yi];
+
+                rbs = r1 - Math.abs(i);
+
+                rsum += r[yi] * rbs;
+                gsum += g[yi] * rbs;
+                bsum += b[yi] * rbs;
+
+                if (i > 0) {
+                    rinsum += sir[0];
+                    ginsum += sir[1];
+                    binsum += sir[2];
+                } else {
+                    routsum += sir[0];
+                    goutsum += sir[1];
+                    boutsum += sir[2];
+                }
+
+                if (i < hm) {
+                    yp += w;
+                }
+            }
+            yi = x;
+            stackpointer = radius;
+            for (y = 0; y < h; y++) {
+                // Preserve alpha channel: ( 0xff000000 & pix[yi] )
+                pix[yi] = (0xff000000 & pix[yi]) | (dv[rsum] << 16) | (dv[gsum] << 8) | dv[bsum];
+
+                rsum -= routsum;
+                gsum -= goutsum;
+                bsum -= boutsum;
+
+                stackstart = stackpointer - radius + div;
+                sir = stack[stackstart % div];
+
+                routsum -= sir[0];
+                goutsum -= sir[1];
+                boutsum -= sir[2];
+
+                if (x == 0) {
+                    vmin[y] = Math.min(y + r1, hm) * w;
+                }
+                p = x + vmin[y];
+
+                sir[0] = r[p];
+                sir[1] = g[p];
+                sir[2] = b[p];
+
+                rinsum += sir[0];
+                ginsum += sir[1];
+                binsum += sir[2];
+
+                rsum += rinsum;
+                gsum += ginsum;
+                bsum += binsum;
+
+                stackpointer = (stackpointer + 1) % div;
+                sir = stack[stackpointer];
+
+                routsum += sir[0];
+                goutsum += sir[1];
+                boutsum += sir[2];
+
+                rinsum -= sir[0];
+                ginsum -= sir[1];
+                binsum -= sir[2];
+
+                yi += w;
+            }
+        }
+        bitmap.setPixels(pix, 0, w, 0, 0, w, h);
+        return bitmap;
+    }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
index 9f6b144ef..789a2366e 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
@@ -78,6 +78,7 @@ public class UserPreferences {
 
     // Other
     public static final String PREF_DATA_FOLDER = "prefDataFolder";
+    public static final String PREF_IMAGE_CACHE_SIZE = "prefImageCacheSize";
 
     // Mediaplayer
     public static final String PREF_PLAYBACK_SPEED = "prefPlaybackSpeed";
@@ -213,7 +214,6 @@ public class UserPreferences {
 
     public static String getPlaybackSpeed() {
         return prefs.getString(PREF_PLAYBACK_SPEED, "1.0");
-
     }
 
     public static String[] getPlaybackSpeedArray() {
@@ -278,6 +278,12 @@ public class UserPreferences {
         return prefs.getBoolean(PREF_ENABLE_AUTODL_WIFI_FILTER, false);
     }
 
+    public static int getImageCacheSize() {
+        String cacheSizeString = prefs.getString(PREF_IMAGE_CACHE_SIZE, "100");
+        int cacheSize = Integer.valueOf(cacheSizeString) * 1024 * 1024;
+        return cacheSize;
+    }
+
     public static int getFastFowardSecs() {
         return prefs.getInt(PREF_FAST_FORWARD_SECS, 30);
     }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java b/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
index 0045f1eb0..b959c7301 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/receiver/FeedUpdateReceiver.java
@@ -19,7 +19,7 @@ public class FeedUpdateReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         Log.d(TAG, "Received intent");
-        if (NetworkUtils.isDownloadAllowed(context)) {
+        if (NetworkUtils.isDownloadAllowed()) {
             DBTasks.refreshAllFeeds(context, null);
         } else {
             Log.d(TAG, "Blocking automatic update: no wifi available / no mobile updates allowed");
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java b/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java
index 44fb14f0c..2f6e67a28 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/FeedMediaSizeService.java
@@ -28,13 +28,13 @@ public class FeedMediaSizeService extends IntentService {
     @Override
     protected void onHandleIntent(Intent intent) {
         Log.d(TAG, "onHandleIntent()");
-        if(false == NetworkUtils.isDownloadAllowed(this)) {
+        if(false == NetworkUtils.isDownloadAllowed()) {
             return;
         }
         List<FeedMedia> list = DBReader.getFeedMediaUnknownSize(this);
         for (FeedMedia media : list) {
             Log.d(TAG, "Getting size currently " + media.getSize() + " for " + media.getDownload_url());
-            if(false == NetworkUtils.isDownloadAllowed(this)) {
+            if(false == NetworkUtils.isDownloadAllowed()) {
                 return;
             }
             long size = Integer.MIN_VALUE;
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
index 3f2222f42..b80b4303f 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/GpodnetSyncService.java
@@ -108,7 +108,7 @@ public class GpodnetSyncService extends Service {
 
 
     private synchronized void sync() {
-        if (GpodnetPreferences.loggedIn() == false || NetworkUtils.networkAvailable(this) == false) {
+        if (GpodnetPreferences.loggedIn() == false || NetworkUtils.networkAvailable() == false) {
             stopSelf();
             return;
         }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
index 3df305027..19a710d24 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java
@@ -777,52 +777,18 @@ public class DownloadService extends Service {
 
                         for (int i = 0; i < savedFeeds.length; i++) {
                             Feed savedFeed = savedFeeds[i];
-                            // Download Feed Image if provided and not downloaded
-                            if (savedFeed.getImage() != null
-                                    && savedFeed.getImage().isDownloaded() == false) {
-                                Log.d(TAG, "Feed has image; Downloading....");
-                                savedFeed.getImage().setOwner(savedFeed);
-                                final Feed savedFeedRef = savedFeed;
-                                try {
-                                    requester.downloadImage(DownloadService.this,
-                                            savedFeedRef.getImage());
-                                } catch (DownloadRequestException e) {
-                                    e.printStackTrace();
-                                    DBWriter.addDownloadStatus(
-                                            DownloadService.this,
-                                            new DownloadStatus(
-                                                    savedFeedRef.getImage(),
-                                                    savedFeedRef
-                                                            .getImage()
-                                                            .getHumanReadableIdentifier(),
-                                                    DownloadError.ERROR_REQUEST_ERROR,
-                                                    false, e.getMessage()
-                                            )
-                                    );
-                                }
-                            }
 
                             // queue new media files for automatic download
                             for (FeedItem item : savedFeed.getItems()) {
                                 if(item.getPubDate() == null) {
                                     Log.d(TAG, item.toString());
                                 }
-                                if(item.getImage() != null && item.getImage().isDownloaded() == false) {
-                                    item.getImage().setOwner(item);
-                                    try {
-                                        requester.downloadImage(DownloadService.this,
-                                            item.getImage());
-                                    } catch (DownloadRequestException e) {
-                                        e.printStackTrace();
-                                    }
-                                }
                                 if (!item.isPlayed() && item.hasMedia() && !item.getMedia().isDownloaded()) {
                                     newMediaFiles.add(item.getMedia().getId());
                                 }
                             }
 
                             // If loadAllPages=true, check if another page is available and queue it for download
-
                             final boolean loadAllPages = results.get(i).first.getArguments().getBoolean(DownloadRequester.REQUEST_ARG_LOAD_ALL_PAGES);
                             final Feed feed = results.get(i).second.feed;
                             if (loadAllPages && feed.getNextPageLink() != null) {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
index 737f0aefd..aa1816e1c 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
@@ -29,12 +29,16 @@ import android.view.KeyEvent;
 import android.view.SurfaceHolder;
 import android.widget.Toast;
 
-import com.squareup.picasso.Picasso;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.animation.GlideAnimation;
+import com.bumptech.glide.request.target.SimpleTarget;
 
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 import de.danoeh.antennapod.core.ClientConfig;
 import de.danoeh.antennapod.core.R;
@@ -769,7 +773,7 @@ public class PlaybackService extends Service {
     /**
      * Used by setupNotification to load notification data in another thread.
      */
-    private AsyncTask<Void, Void, Void> notificationSetupTask;
+    private Thread notificationSetupThread;
 
     /**
      * Prepares notification and starts the service in the foreground.
@@ -780,50 +784,47 @@ public class PlaybackService extends Service {
                 PlaybackService.getPlayerActivityIntent(this),
                 PendingIntent.FLAG_UPDATE_CURRENT);
 
-        if (notificationSetupTask != null) {
-            notificationSetupTask.cancel(true);
+        if (notificationSetupThread != null) {
+            notificationSetupThread.interrupt();
         }
-        notificationSetupTask = new AsyncTask<Void, Void, Void>() {
+        Runnable notificationSetupTask = new Runnable() {
             Bitmap icon = null;
 
             @Override
-            protected Void doInBackground(Void... params) {
+            public void run() {
                 Log.d(TAG, "Starting background work");
                 if (android.os.Build.VERSION.SDK_INT >= 11) {
                     if (info.playable != null) {
+                        int iconSize = getResources().getDimensionPixelSize(
+                                android.R.dimen.notification_large_icon_width);
                         try {
-                            int iconSize = getResources().getDimensionPixelSize(
-                                    android.R.dimen.notification_large_icon_width);
-                            icon = Picasso.with(PlaybackService.this)
+                            icon = Glide.with(PlaybackService.this)
                                     .load(info.playable.getImageUri())
-                                    .resize(iconSize, iconSize)
+                                    .asBitmap()
+                                    .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+                                    .into(-1, -1) // this resizing would not be exact, so we have
+                                                  // scale the bitmap ourselves
                                     .get();
-                        } catch (IOException e) {
+                            icon = Bitmap.createScaledBitmap(icon, iconSize, iconSize, true);
+                        } catch (InterruptedException e) {
+                            e.printStackTrace();
+                        } catch (ExecutionException e) {
                             e.printStackTrace();
                         }
                     }
-
                 }
                 if (icon == null) {
                     icon = BitmapFactory.decodeResource(getApplicationContext().getResources(),
                             ClientConfig.playbackServiceCallbacks.getNotificationIconResource(getApplicationContext()));
                 }
 
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void result) {
-                super.onPostExecute(result);
                 if (mediaPlayer == null) {
                     return;
                 }
                 PlayerStatus playerStatus = mediaPlayer.getPlayerStatus();
                 final int smallIcon = ClientConfig.playbackServiceCallbacks.getNotificationIconResource(getApplicationContext());
 
-                if (!isCancelled() &&
-                        started &&
-                        info.playable != null) {
+                if (!Thread.currentThread().isInterrupted() && started && info.playable != null) {
                     String contentText = info.playable.getFeedTitle();
                     String contentTitle = info.playable.getEpisodeTitle();
                     Notification notification = null;
@@ -901,15 +902,9 @@ public class PlaybackService extends Service {
                     Log.d(TAG, "Notification set up");
                 }
             }
-
         };
-        if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
-            notificationSetupTask
-                    .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        } else {
-            notificationSetupTask.execute();
-        }
-
+        notificationSetupThread = new Thread(notificationSetupTask);
+        notificationSetupThread.start();
     }
 
     /**
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java b/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
index 92de1eee7..0e6b23696 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/APDownloadAlgorithm.java
@@ -40,7 +40,7 @@ public class APDownloadAlgorithm implements AutomaticDownloadAlgorithm {
             public void run() {
 
                 // true if we should auto download based on network status
-                boolean networkShouldAutoDl = NetworkUtils.autodownloadNetworkAvailable(context)
+                boolean networkShouldAutoDl = NetworkUtils.autodownloadNetworkAvailable()
                         && UserPreferences.isEnableAutodownload();
 
                 // true if we should auto download based on power status
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
index cfbfd152b..5ed0a6ee3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java
@@ -871,7 +871,11 @@ public final class DBReader {
             if (cursor.moveToFirst()) {
                 String username = cursor.getString(0);
                 String password = cursor.getString(1);
-                return username + ":" + password;
+                if(username != null && password != null) {
+                    return username + ":" + password;
+                } else {
+                    return "";
+                }
             }
             return "";
         } finally {
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
index b08013c65..770c4f7d7 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBTasks.java
@@ -284,24 +284,6 @@ public final class DBTasks {
     }
 
     /**
-     * Notifies the database about a missing FeedImage file. This method will attempt to re-download the file.
-     *
-     * @param context Used for requesting the download.
-     * @param image   The FeedImage object.
-     */
-    public static void notifyInvalidImageFile(final Context context,
-                                              final FeedImage image) {
-        Log.i(TAG,
-                "The DB was notified about an invalid image download. It will now try to re-download the image file");
-        try {
-            DownloadRequester.getInstance().downloadImage(context, image);
-        } catch (DownloadRequestException e) {
-            e.printStackTrace();
-            Log.w(TAG, "Failed to download invalid feed image");
-        }
-    }
-
-    /**
      * Notifies the database about a missing FeedMedia file. This method will correct the FeedMedia object's values in the
      * DB and send a FeedUpdateBroadcast.
      */
diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
index ca6aa0178..74dce17f4 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DownloadRequester.java
@@ -18,7 +18,6 @@ import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.feed.EventDistributor;
 import de.danoeh.antennapod.core.feed.Feed;
 import de.danoeh.antennapod.core.feed.FeedFile;
-import de.danoeh.antennapod.core.feed.FeedImage;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.service.download.DownloadRequest;
@@ -186,15 +185,6 @@ public class DownloadRequester {
         downloadFeed(context, feed, false);
     }
 
-    public synchronized void downloadImage(Context context, FeedImage image)
-            throws DownloadRequestException {
-        if (feedFileValid(image)) {
-            FeedFile container = (image.getOwner() instanceof FeedFile) ? (FeedFile) image.getOwner() : null;
-            download(context, image, container, new File(getImagefilePath(context),
-                    getImagefileName(image)), false, null, null, 0, false, null);
-        }
-    }
-
     public synchronized void downloadMedia(Context context, FeedMedia feedmedia)
             throws DownloadRequestException {
         if (feedFileValid(feedmedia)) {
@@ -332,20 +322,6 @@ public class DownloadRequester {
         return "feed-" + FileNameGenerator.generateFileName(filename);
     }
 
-    public synchronized String getImagefilePath(Context context)
-            throws DownloadRequestException {
-        return getExternalFilesDirOrThrowException(context, IMAGE_DOWNLOADPATH)
-                .toString() + "/";
-    }
-
-    public synchronized String getImagefileName(FeedImage image) {
-        String filename = image.getDownload_url();
-        if (image.getOwner() != null && image.getOwner().getHumanReadableIdentifier() != null) {
-            filename = image.getOwner().getHumanReadableIdentifier();
-        }
-        return "image-" + FileNameGenerator.generateFileName(filename);
-    }
-
     public synchronized String getMediafilePath(Context context, FeedMedia media)
             throws DownloadRequestException {
         File externalStorage = getExternalFilesDirOrThrowException(
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
index 917f99564..2bf88b3f3 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java
@@ -26,7 +26,7 @@ public final class Converter {
     /** Determines the length of the number for best readability.*/
     private static final int NUM_LENGTH = 1024;
     
-    
+    private static final int DAYS_MIL = 86400000;
     private static final int HOURS_MIL = 3600000;
 	private static final int MINUTES_MIL = 60000;
 	private static final int SECONDS_MIL = 1000;
@@ -104,18 +104,18 @@ public final class Converter {
     }
 
     /** Converts milliseconds to a localized string containing hours and minutes */
-    public static String getDurationStringLocalized(Context context, int duration) {
-        int h = duration / HOURS_MIL;
-        int rest = duration - h * HOURS_MIL;
+    public static String getDurationStringLocalized(Context context, long duration) {
+        int h = (int)(duration / HOURS_MIL);
+        int rest = (int)(duration - h * HOURS_MIL);
         int m = rest / MINUTES_MIL;
 
         String result = "";
         if(h > 0) {
-            String hours = context.getString(R.string.time_unit_hours);
-            result += h + " " + hours + " ";
+            String hours = context.getResources().getQuantityString(R.plurals.time_unit_hours, h, h);
+            result += hours + " ";
         }
-        String minutes = context.getString(R.string.time_unit_minutes);
-        result += m + " " + minutes;
+        String minutes = context.getResources().getQuantityString(R.plurals.time_unit_minutes, m, m);
+        result += minutes;
         return result;
     }
     
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
index 7b06128f9..c0233f684 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/DateUtils.java
@@ -8,6 +8,7 @@ import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * Parses several date formats.
@@ -17,50 +18,66 @@ public class DateUtils {
 	private static final String TAG = "DateUtils";
 
     private static final SimpleDateFormat parser = new SimpleDateFormat("", Locale.US);
+    private static final TimeZone defaultTimezone = TimeZone.getTimeZone("GMT");
+
     static {
         parser.setLenient(false);
+        parser.setTimeZone(defaultTimezone);
     }
 
     public static Date parse(final String input) {
         if(input == null) {
-            throw new IllegalArgumentException("Date most not be null");
+            throw new IllegalArgumentException("Date must not be null");
         }
-        String date = input.replace('/', '-');
+        String date = input.trim().replace('/', '-').replaceAll("( ){2,}+", " ");
+
+        // if datetime is more precise than seconds, make sure the value is in ms
         if(date.contains(".")) {
             int start = date.indexOf('.');
             int current = start+1;
             while(current < date.length() && Character.isDigit(date.charAt(current))) {
                 current++;
             }
+            // even more precise than microseconds: discard further decimal places
             if(current - start > 4) {
                 if(current < date.length()-1) {
                     date = date.substring(0, start + 4) + date.substring(current);
                 } else {
                     date = date.substring(0, start + 4);
                 }
+            // less than 4 decimal places: pad to have a consistent format for the parser
             } else if(current - start < 4) {
                 if(current < date.length()-1) {
                     date = date.substring(0, current) + StringUtils.repeat("0", 4-(current-start)) + date.substring(current);
                 } else {
                     date = date.substring(0, current) + StringUtils.repeat("0", 4-(current-start));
                 }
-
             }
         }
         String[] patterns = {
                 "dd MMM yy HH:mm:ss Z",
                 "dd MMM yy HH:mm Z",
                 "EEE, dd MMM yyyy HH:mm:ss Z",
+                "EEE, dd MMM yyyy HH:mm:ss",
                 "EEE, dd MMMM yyyy HH:mm:ss Z",
+                "EEE, dd MMMM yyyy HH:mm:ss",
+                "EEEE, dd MMM yyyy HH:mm:ss Z",
                 "EEEE, dd MMM yy HH:mm:ss Z",
+                "EEEE, dd MMM yyyy HH:mm:ss",
+                "EEEE, dd MMM yy HH:mm:ss",
                 "EEE MMM d HH:mm:ss yyyy",
                 "EEE, dd MMM yyyy HH:mm Z",
+                "EEE, dd MMM yyyy HH:mm",
                 "EEE, dd MMMM yyyy HH:mm Z",
+                "EEE, dd MMMM yyyy HH:mm",
+                "EEEE, dd MMM yyyy HH:mm Z",
                 "EEEE, dd MMM yy HH:mm Z",
+                "EEEE, dd MMM yyyy HH:mm",
+                "EEEE, dd MMM yy HH:mm",
                 "EEE MMM d HH:mm yyyy",
                 "yyyy-MM-dd'T'HH:mm:ss",
-                "yyyy-MM-dd'T'HH:mm:ss.SSS",
                 "yyyy-MM-dd'T'HH:mm:ss.SSS Z",
+                "yyyy-MM-dd'T'HH:mm:ss.SSS",
                 "yyyy-MM-dd'T'HH:mm:ssZ",
                 "yyyy-MM-dd'T'HH:mm:ss'Z'",
                 "yyyy-MM-ddZ",
@@ -77,7 +94,7 @@ public class DateUtils {
             }
         }
 
-        Log.d(TAG, "Could not parse date string \"" + input + "\"");
+        Log.d(TAG, "Could not parse date string \"" + input + "\" [" + date + "]");
         return null;
     }
 
@@ -117,6 +134,7 @@ public class DateUtils {
 
     public static String formatRFC3339UTC(Date date) {
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+        format.setTimeZone(defaultTimezone);
         return format.format(date);
     }
 }
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
index 3a349e221..9296039f0 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/NetworkUtils.java
@@ -10,14 +10,16 @@ import android.util.Log;
 import java.util.Arrays;
 import java.util.List;
 
-import de.danoeh.antennapod.core.BuildConfig;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 public class NetworkUtils {
-	private static final String TAG = "NetworkUtils";
 
-	private NetworkUtils() {
+	private static final String TAG = NetworkUtils.class.getSimpleName();
 
+	private static Context context;
+
+	public static void init(Context context) {
+		NetworkUtils.context = context;
 	}
 
 	/**
@@ -26,18 +28,16 @@ public class NetworkUtils {
 	 * network that is on the 'selected networks' list of the Wi-Fi filter for
 	 * automatic downloads and false otherwise.
 	 * */
-	public static boolean autodownloadNetworkAvailable(Context context) {
+	public static boolean autodownloadNetworkAvailable() {
 		ConnectivityManager cm = (ConnectivityManager) context
 				.getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo networkInfo = cm.getActiveNetworkInfo();
 		if (networkInfo != null) {
 			if (networkInfo.getType() == ConnectivityManager.TYPE_WIFI) {
-				if (BuildConfig.DEBUG)
-					Log.d(TAG, "Device is connected to Wi-Fi");
+				Log.d(TAG, "Device is connected to Wi-Fi");
 				if (networkInfo.isConnected()) {
 					if (!UserPreferences.isEnableAutodownloadWifiFilter()) {
-						if (BuildConfig.DEBUG)
-							Log.d(TAG, "Auto-dl filter is disabled");
+						Log.d(TAG, "Auto-dl filter is disabled");
 						return true;
 					} else {
 						WifiManager wm = (WifiManager) context
@@ -48,31 +48,28 @@ public class NetworkUtils {
 										.getAutodownloadSelectedNetworks());
 						if (selectedNetworks.contains(Integer.toString(wifiInfo
 								.getNetworkId()))) {
-							if (BuildConfig.DEBUG)
-								Log.d(TAG,
-										"Current network is on the selected networks list");
+							Log.d(TAG, "Current network is on the selected networks list");
 							return true;
 						}
 					}
 				}
 			}
 		}
-		if (BuildConfig.DEBUG)
-			Log.d(TAG, "Network for auto-dl is not available");
+		Log.d(TAG, "Network for auto-dl is not available");
 		return false;
 	}
 
-    public static boolean networkAvailable(Context context) {
+    public static boolean networkAvailable() {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo info = cm.getActiveNetworkInfo();
         return info != null && info.isConnected();
     }
 
-	public static boolean isDownloadAllowed(Context context) {
-		return UserPreferences.isAllowMobileUpdate() || NetworkUtils.connectedToWifi(context);
+	public static boolean isDownloadAllowed() {
+		return UserPreferences.isAllowMobileUpdate() || NetworkUtils.connectedToWifi();
 	}
 
-	public static boolean connectedToWifi(Context context) {
+	public static boolean connectedToWifi() {
 		ConnectivityManager connManager = (ConnectivityManager) context
 				.getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo mWifi = connManager
diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java
index 7ebd580f7..752e95985 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java
@@ -7,7 +7,7 @@ import android.util.Log;
 
 import java.util.List;
 
-import de.danoeh.antennapod.core.asynctask.PicassoImageResource;
+import de.danoeh.antennapod.core.asynctask.ImageResource;
 import de.danoeh.antennapod.core.feed.Chapter;
 import de.danoeh.antennapod.core.feed.FeedMedia;
 import de.danoeh.antennapod.core.feed.MediaType;
@@ -18,7 +18,7 @@ import de.danoeh.antennapod.core.util.ShownotesProvider;
  * Interface for objects that can be played by the PlaybackService.
  */
 public interface Playable extends Parcelable,
-        ShownotesProvider, PicassoImageResource {
+        ShownotesProvider, ImageResource {
 
     /**
      * Save information about the playable in a preference so that it can be