chore(deps): upgraded glide to 4.10.0 (#2891)

Author: codedsun

app/build.gradle

@@ -166,7 +166,8 @@ dependencies {
     implementation 'com.github.deano2390:MaterialShowcaseView:1.2.0@aar'
     implementation "com.jakewharton:butterknife:$rootProject.butterknifeVersion"
     annotationProcessor "com.jakewharton:butterknife-compiler:$rootProject.butterknifeVersion"
-    implementation 'com.github.bumptech.glide:glide:3.7.0'
+    implementation "com.github.bumptech.glide:glide:$rootProject.glideVersion"
+    implementation "com.github.bumptech.glide:gifencoder-integration:$rootProject.glideVersion"
     implementation 'com.yalantis:ucrop:1.5.0'
     implementation 'de.psdev.licensesdialog:licensesdialog:1.8.0'
     /*implementation('com.crashlytics.sdk.android:crashlytics:2.9.3@aar') {

app/src/main/java/org/fossasia/phimpme/editor/CompressImageActivity.java

@@ -104,7 +104,7 @@ private void initView() {
     ImageViewTouch imageViewToucher = findViewById(R.id.main_image);
     saveFilePath = getIntent().getStringExtra(EXTRA_OUTPUT);
     Uri uri = Uri.fromFile(new File(saveFilePath));
-    Glide.with(this).load(uri).diskCacheStrategy(DiskCacheStrategy.SOURCE).into(imageViewToucher);
+    Glide.with(this).load(uri).diskCacheStrategy(DiskCacheStrategy.DATA).into(imageViewToucher);
     imageViewToucher.setDisplayType(ImageViewTouchBase.DisplayType.FIT_TO_SCREEN);
   }
 

app/src/main/java/org/fossasia/phimpme/gallery/CustomGlideModule.java

@@ -1,22 +1,31 @@
 package org.fossasia.phimpme.gallery;
 
 import android.content.Context;
+import androidx.annotation.NonNull;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.GlideBuilder;
+import com.bumptech.glide.Registry;
 import com.bumptech.glide.load.DecodeFormat;
 import com.bumptech.glide.load.engine.bitmap_recycle.LruBitmapPool;
 import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory;
 import com.bumptech.glide.load.engine.cache.LruResourceCache;
 import com.bumptech.glide.load.engine.cache.MemorySizeCalculator;
+import com.bumptech.glide.module.GlideModule;
+import com.bumptech.glide.request.RequestOptions;
 
 /** Created by dnld on 10/03/16. */
-public class CustomGlideModule implements com.bumptech.glide.module.GlideModule {
+public class CustomGlideModule implements GlideModule {
+
+  @Override
+  public void registerComponents(
+      @NonNull Context context, @NonNull Glide glide, @NonNull Registry registry) {}
+
   @Override
   public void applyOptions(Context context, GlideBuilder builder) {
     // Apply options to the builder here.
-    builder.setDecodeFormat(DecodeFormat.PREFER_ARGB_8888);
+    builder.setDefaultRequestOptions(new RequestOptions().format(DecodeFormat.PREFER_ARGB_8888));
 
-    MemorySizeCalculator calculator = new MemorySizeCalculator(context);
+    MemorySizeCalculator calculator = new MemorySizeCalculator.Builder(context).build();
     int defaultMemoryCacheSize = calculator.getMemoryCacheSize();
     int defaultBitmapPoolSize = calculator.getBitmapPoolSize();
 
@@ -30,9 +39,4 @@ public void applyOptions(Context context, GlideBuilder builder) {
 
     builder.setDiskCache(new InternalCacheDiskCacheFactory(context, cacheSize100MegaBytes));
   }
-
-  @Override
-  public void registerComponents(Context context, Glide glide) {
-    // register ModelLoaders here.
-  }
 }

app/src/main/java/org/fossasia/phimpme/gallery/adapters/AlbumsAdapter.java

@@ -14,11 +14,15 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import com.bumptech.glide.GenericTransitionOptions;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import com.mikepenz.community_material_typeface_library.CommunityMaterial;
@@ -91,20 +95,23 @@ public void onBindViewHolder(final AlbumsAdapter.ViewHolder holder, int position
     String path = "";
     path = f.getPath();
     Glide.with(holder.picture.getContext())
-        .load(path)
         .asBitmap()
-        .diskCacheStrategy(DiskCacheStrategy.RESULT)
+        .load(path)
+        .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
         .priority(Priority.HIGH)
         .signature(f.getSignature())
         .centerCrop()
         .error(R.drawable.ic_error)
         .placeholder(placeholder)
-        .animate(R.anim.fade_in)
+        .transition(new GenericTransitionOptions<>().transition(R.anim.fade_in))
         .listener(
-            new RequestListener<String, Bitmap>() {
+            new RequestListener<Bitmap>() {
               @Override
-              public boolean onException(
-                  Exception e, String model, Target<Bitmap> target, boolean isFirstResource) {
+              public boolean onLoadFailed(
+                  @Nullable GlideException e,
+                  Object model,
+                  Target<Bitmap> target,
+                  boolean isFirstResource) {
                 PreferenceUtil SP = PreferenceUtil.getInstance(context);
                 SP.putBoolean(
                     holder
@@ -118,9 +125,9 @@ public boolean onException(
               @Override
               public boolean onResourceReady(
                   Bitmap resource,
-                  String model,
+                  Object model,
                   Target<Bitmap> target,
-                  boolean isFromMemoryCache,
+                  DataSource dataSource,
                   boolean isFirstResource) {
                 return false;
               }

app/src/main/java/org/fossasia/phimpme/gallery/adapters/ImageAdapter.java

@@ -5,7 +5,7 @@
 
 import android.content.Context;
 import android.graphics.Point;
-import android.net.Uri;
+import android.graphics.drawable.Drawable;
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -14,10 +14,12 @@
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.DataSource;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.resource.drawable.GlideDrawable;
+import com.bumptech.glide.load.engine.GlideException;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.target.Target;
 import java.util.ArrayList;
@@ -60,22 +62,25 @@ public void onBindViewHolder(final ViewHolder holder, int position) {
     holder.imageView.setTransitionName(context.getString(R.string.transition_photo));
     Glide.with(getContext())
         .load(media.get(position).getUri())
-        .diskCacheStrategy(DiskCacheStrategy.SOURCE)
+        .diskCacheStrategy(DiskCacheStrategy.DATA)
         .thumbnail(0.5f)
         .listener(
-            new RequestListener<Uri, GlideDrawable>() {
+            new RequestListener<Drawable>() {
               @Override
-              public boolean onException(
-                  Exception e, Uri model, Target<GlideDrawable> target, boolean isFirstResource) {
+              public boolean onLoadFailed(
+                  @Nullable GlideException e,
+                  Object model,
+                  Target<Drawable> target,
+                  boolean isFirstResource) {
                 return false;
               }
 
               @Override
               public boolean onResourceReady(
-                  GlideDrawable resource,
-                  Uri model,
-                  Target<GlideDrawable> target,
-                  boolean isFromMemoryCache,
+                  Drawable resource,
+                  Object model,
+                  Target<Drawable> target,
+                  DataSource dataSource,
                   boolean isFirstResource) {
                 startPostponedTransition(holder.imageView);
                 return false;

app/src/main/java/org/fossasia/phimpme/gallery/adapters/MediaAdapter.java

@@ -13,6 +13,7 @@
 import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import com.bumptech.glide.GenericTransitionOptions;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.mikepenz.community_material_typeface_library.CommunityMaterial;
@@ -66,13 +67,13 @@ public void onBindViewHolder(final MediaAdapter.ViewHolder holder, int position)
 
     Glide.with(holder.imageView.getContext())
         .load(f.getUri())
-        .asBitmap()
+        //        .asBitmap()
         .signature(f.getSignature())
         .centerCrop()
-        .diskCacheStrategy(DiskCacheStrategy.RESULT)
+        .diskCacheStrategy(DiskCacheStrategy.RESOURCE)
         .thumbnail(0.5f)
         .placeholder(placeholder)
-        .animate(R.anim.fade_in)
+        .transition(new GenericTransitionOptions<>().transition(R.anim.fade_in))
         .into(holder.imageView);
     holder.icon.setVisibility(View.GONE);
     holder.path.setVisibility(View.GONE);

app/src/main/java/org/fossasia/phimpme/gallery/data/Media.java

@@ -11,6 +11,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.text.TextUtils;
+import com.bumptech.glide.signature.ObjectKey;
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;
 import com.drew.lang.GeoLocation;
@@ -32,7 +33,6 @@
 import org.fossasia.phimpme.data.local.ImageDescModel;
 import org.fossasia.phimpme.gallery.activities.SingleMediaActivity;
 import org.fossasia.phimpme.gallery.data.base.MediaDetailsMap;
-import org.fossasia.phimpme.gallery.util.MediaSignature;
 import org.fossasia.phimpme.gallery.util.StringUtils;
 import org.jetbrains.annotations.TestOnly;
 
@@ -153,8 +153,8 @@ public Bitmap getBitmap() {
     return bitmap;
   }
 
-  public MediaSignature getSignature() {
-    return new MediaSignature(this);
+  public ObjectKey getSignature() {
+    return new ObjectKey(path + getDateModified());
   }
 
   // <editor-fold desc="Exif & More">

app/src/main/java/org/fossasia/phimpme/gallery/util/AlertDialogsHelper.java

@@ -20,6 +20,7 @@
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.cardview.widget.CardView;
+import com.bumptech.glide.GenericTransitionOptions;
 import com.bumptech.glide.Glide;
 import com.drew.lang.GeoLocation;
 import java.lang.reflect.Field;
@@ -192,10 +193,10 @@ public static AlertDialog getDetailsDialog(
                   StaticMapProvider.GOOGLE_MAPS.getValue()));
 
       Glide.with(activity.getApplicationContext())
-          .load(staticMapProvider.getUrl(location))
           .asBitmap()
+          .load(staticMapProvider.getUrl(location))
           .centerCrop()
-          .animate(R.anim.fade_in)
+          .transition(new GenericTransitionOptions<>().transition(R.anim.fade_in))
           .into(imgMap);
 
       imgMap.setOnClickListener(

app/src/main/java/org/fossasia/phimpme/gallery/util/MediaSignature.java

@@ -3,17 +3,21 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
+import androidx.annotation.NonNull;
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
+import java.security.MessageDigest;
 
 /** Created by dnld on 21/08/16. */
 public class RotateTransformation extends BitmapTransformation {
 
   private float rotateRotationAngle = 0f;
   private boolean increment = false;
 
+  @Override
+  public void updateDiskCacheKey(@NonNull MessageDigest messageDigest) {}
+
   public RotateTransformation(Context context, float rotateRotationAngle, boolean increment) {
-    super(context);
     this.rotateRotationAngle = rotateRotationAngle;
     this.increment = increment;
   }
@@ -32,9 +36,4 @@ protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, in
     return Bitmap.createBitmap(
         toTransform, 0, 0, toTransform.getWidth(), toTransform.getHeight(), matrix, true);
   }
-
-  @Override
-  public String getId() {
-    return "rotate" + rotateRotationAngle;
-  }
 }