Merge pull request #2859 from ByteHamster/glide-48

Upgraded Glide to version 4.8.0

5 files changed, 66 insertions, 39 deletions

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
index 835dee735..ec10b78aa 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApGlideModule.java
@@ -2,31 +2,35 @@ package de.danoeh.antennapod.core.glide;
 
 import android.content.Context;
 
+import android.support.annotation.NonNull;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.GlideBuilder;
+import com.bumptech.glide.Registry;
+import com.bumptech.glide.annotation.GlideModule;
 import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
-import com.bumptech.glide.module.GlideModule;
+import com.bumptech.glide.module.AppGlideModule;
 
 import java.io.InputStream;
 
+import com.bumptech.glide.request.RequestOptions;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 
 /**
  * {@see com.bumptech.glide.integration.okhttp.OkHttpGlideModule}
  */
-public class ApGlideModule implements GlideModule {
+@GlideModule
+public class ApGlideModule extends AppGlideModule {
 
     @Override
-    public void applyOptions(Context context, GlideBuilder builder) {
-        builder.setDecodeFormat(DecodeFormat.PREFER_ARGB_8888);
+    public void applyOptions(@NonNull Context context, @NonNull GlideBuilder builder) {
+        builder.setDefaultRequestOptions(new RequestOptions().format(DecodeFormat.PREFER_ARGB_8888));
         builder.setDiskCache(new InternalCacheDiskCacheFactory(context,
                 UserPreferences.getImageCacheSize()));
     }
 
     @Override
-    public void registerComponents(Context context, Glide glide) {
-        glide.register(String.class, InputStream.class, new ApOkHttpUrlLoader.Factory());
+    public void registerComponents(@NonNull Context context, @NonNull Glide glide, @NonNull Registry registry) {
+        registry.append(String.class, InputStream.class, new ApOkHttpUrlLoader.Factory());
     }
-
 }
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
index 3e4f06a12..bd5276100 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/ApOkHttpUrlLoader.java
@@ -1,12 +1,12 @@
 package de.danoeh.antennapod.core.glide;
 
-import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
 
 import com.bumptech.glide.integration.okhttp3.OkHttpStreamFetcher;
-import com.bumptech.glide.load.data.DataFetcher;
-import com.bumptech.glide.load.model.GenericLoaderFactory;
+import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.GlideUrl;
 import com.bumptech.glide.load.model.ModelLoader;
 import com.bumptech.glide.load.model.ModelLoaderFactory;
@@ -15,6 +15,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 
+import com.bumptech.glide.load.model.MultiModelLoaderFactory;
+import com.bumptech.glide.signature.ObjectKey;
 import de.danoeh.antennapod.core.service.download.AntennapodHttpClient;
 import de.danoeh.antennapod.core.service.download.HttpDownloader;
 import de.danoeh.antennapod.core.storage.DBReader;
@@ -56,19 +58,20 @@ class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
         /**
          * Constructor for a new Factory that runs requests using a static singleton client.
          */
-        public Factory() {
+        Factory() {
             this(getInternalClient());
         }
 
         /**
          * Constructor for a new Factory that runs requests using given client.
          */
-        public Factory(OkHttpClient client) {
+        Factory(OkHttpClient client) {
             this.client = client;
         }
 
+        @NonNull
         @Override
-        public ModelLoader<String, InputStream> build(Context context, GenericLoaderFactory factories) {
+        public ModelLoader<String, InputStream> build(@NonNull MultiModelLoaderFactory multiFactory) {
             return new ApOkHttpUrlLoader(client);
         }
 
@@ -84,20 +87,26 @@ class ApOkHttpUrlLoader implements ModelLoader<String, InputStream> {
         this.client = client;
     }
 
+    @Nullable
     @Override
-    public DataFetcher<InputStream> getResourceFetcher(String model, int width, int height) {
-        Log.d(TAG, "getResourceFetcher() called with: " + "model = [" + model + "], width = ["
+    public LoadData<InputStream> buildLoadData(@NonNull String model, int width, int height, @NonNull Options options) {
+        Log.d(TAG, "buildLoadData() called with: " + "model = [" + model + "], width = ["
                 + width + "], height = [" + height + "]");
         if(TextUtils.isEmpty(model)) {
             return null;
         } else if(model.startsWith("/")) {
-            return new AudioCoverFetcher(model);
+            return new LoadData<>(new ObjectKey(model), new AudioCoverFetcher(model));
         } else {
             GlideUrl url = new GlideUrl(model);
-            return new OkHttpStreamFetcher(client, url);
+            return new LoadData<>(new ObjectKey(model), new OkHttpStreamFetcher(client, url));
         }
     }
 
+    @Override
+    public boolean handles(@NonNull String s) {
+        return true;
+    }
+
     private static class NetworkAllowanceInterceptor implements Interceptor {
 
         @Override
diff --git a/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java b/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
index 8159a1b3e..479846655 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/AudioCoverFetcher.java
@@ -2,7 +2,9 @@ package de.danoeh.antennapod.core.glide;
 
 import android.media.MediaMetadataRetriever;
 
+import android.support.annotation.NonNull;
 import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.data.DataFetcher;
 
 import java.io.ByteArrayInputStream;
@@ -20,22 +22,20 @@ class AudioCoverFetcher implements DataFetcher<InputStream> {
         this.path = path;
     }
 
-    @Override public String getId() {
-        return path;
-    }
-
-    @Override public InputStream loadData(Priority priority) throws Exception {
+    @Override
+    public void loadData(@NonNull Priority priority, @NonNull DataCallback<? super InputStream> callback) {
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         try {
             retriever.setDataSource(path);
             byte[] picture = retriever.getEmbeddedPicture();
             if (picture != null) {
-                return new ByteArrayInputStream(picture);
+                callback.onDataReady(new ByteArrayInputStream(picture));
+                return;
             }
         } finally {
             retriever.release();
         }
-        throw new IOException("Loading embedded cover did not work");
+        callback.onLoadFailed(new IOException("Loading embedded cover did not work"));
     }
 
     @Override public void cleanup() {
@@ -44,4 +44,16 @@ class AudioCoverFetcher implements DataFetcher<InputStream> {
     @Override public void cancel() {
         // cannot cancel
     }
+
+    @NonNull
+    @Override
+    public Class<InputStream> getDataClass() {
+        return InputStream.class;
+    }
+
+    @NonNull
+    @Override
+    public DataSource getDataSource() {
+        return DataSource.LOCAL;
+    }
 }
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
index ee58c2f39..a740782d6 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/glide/FastBlurTransformation.java
@@ -1,13 +1,15 @@
 package de.danoeh.antennapod.core.glide;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.media.ThumbnailUtils;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
 
+import java.security.MessageDigest;
+
 public class FastBlurTransformation extends BitmapTransformation {
 
     private static final String TAG = FastBlurTransformation.class.getSimpleName();
@@ -15,8 +17,8 @@ public class FastBlurTransformation extends BitmapTransformation {
     private static final int STACK_BLUR_RADIUS = 1;
     private static final int BLUR_IMAGE_WIDTH = 150;
 
-    public FastBlurTransformation(Context context) {
-        super(context);
+    public FastBlurTransformation() {
+        super();
     }
 
     @Override
@@ -33,11 +35,6 @@ public class FastBlurTransformation extends BitmapTransformation {
         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
@@ -264,4 +261,8 @@ public class FastBlurTransformation extends BitmapTransformation {
         return bitmap;
     }
 
+    @Override
+    public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {
+        messageDigest.update(TAG.getBytes());
+    }
 }
\ No newline at end of file
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 68c9ac0ce..aea043a91 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
@@ -39,6 +39,7 @@ import android.view.SurfaceHolder;
 import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
 
 import java.util.ArrayList;
@@ -1165,10 +1166,10 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                     builder.putString(MediaMetadataCompat.METADATA_KEY_ART_URI, imageLocation);
                     try {
                         Bitmap art = Glide.with(this)
-                                .load(imageLocation)
                                 .asBitmap()
-                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                                .into(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                                .load(imageLocation)
+                                .apply(RequestOptions.diskCacheStrategyOf(ApGlideSettings.AP_DISK_CACHE_STRATEGY))
+                                .submit(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
                                 .get();
                         builder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, art);
                     } catch (Throwable tr) {
@@ -1239,11 +1240,11 @@ public class PlaybackService extends MediaBrowserServiceCompat {
                         android.R.dimen.notification_large_icon_width);
                 try {
                     icon = Glide.with(PlaybackService.this)
-                            .load(playable.getImageLocation())
                             .asBitmap()
-                            .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                            .centerCrop()
-                            .into(iconSize, iconSize)
+                            .load(playable.getImageLocation())
+                            .apply(RequestOptions.diskCacheStrategyOf(ApGlideSettings.AP_DISK_CACHE_STRATEGY))
+                            .apply(new RequestOptions().centerCrop())
+                            .submit(iconSize, iconSize)
                             .get();
                 } catch (Throwable tr) {
                     Log.e(TAG, "Error loading the media icon for the notification", tr);