Update to glide 4.x

// FREEBIE
2025-10-23 17:48:50 +00:00 · 2017-10-11 17:12:46 -07:00
parent 17dd681dc8
commit 10f224ede5
35 changed files with 639 additions and 633 deletions
--- a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
+++ b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
@@ -20,7 +20,6 @@ import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;

-import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.signature.MediaStoreSignature;
@@ -28,6 +27,7 @@ import com.bumptech.glide.signature.MediaStoreSignature;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
 import org.thoughtcrime.securesms.database.loaders.RecentPhotosLoader;
+import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.util.ViewUtil;

 public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.LoaderCallbacks<Cursor> {
@@ -111,12 +111,11 @@ public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.Lo

      Key signature = new MediaStoreSignature(mimeType, dateModified, orientation);

-      Glide.with(getContext())
-           .fromMediaStore()
-           .load(uri)
-           .signature(signature)
-           .diskCacheStrategy(DiskCacheStrategy.NONE)
-           .into(viewHolder.imageView);
+      GlideApp.with(getContext())
+              .load(uri)
+              .signature(signature)
+              .diskCacheStrategy(DiskCacheStrategy.NONE)
+              .into(viewHolder.imageView);

      viewHolder.imageView.setOnClickListener(new OnClickListener() {
        @Override
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -15,22 +15,25 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;

-import com.bumptech.glide.DrawableRequestBuilder;
-import com.bumptech.glide.GenericRequestBuilder;
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;

 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
-import org.thoughtcrime.securesms.mms.RoundedCorners;
+import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.mms.SlideClickListener;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.whispersystems.libsignal.util.guava.Optional;

+import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade;
+
 public class ThumbnailView extends FrameLayout {

  private static final String TAG = ThumbnailView.class.getSimpleName();
@@ -141,18 +144,18 @@ public class ThumbnailView extends FrameLayout {

    if      (slide.getThumbnailUri() != null) buildThumbnailGlideRequest(slide, masterSecret).into(image);
    else if (slide.hasPlaceholder())          buildPlaceholderGlideRequest(slide).into(image);
-    else                                      Glide.clear(image);
+    else                                      Glide.with(getContext()).clear(image);
  }

  public void setImageResource(@NonNull MasterSecret masterSecret, @NonNull Uri uri) {
    if (transferControls.isPresent()) getTransferControls().setVisibility(View.GONE);

-    Glide.with(getContext())
-         .load(new DecryptableUri(masterSecret, uri))
-         .diskCacheStrategy(DiskCacheStrategy.NONE)
-         .crossFade()
-         .transform(new RoundedCorners(getContext(), true, radius, backgroundColorHint))
-         .into(image);
+    GlideApp.with(getContext())
+            .load(new DecryptableUri(masterSecret, uri))
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .transform(new RoundedCorners(radius))
+            .transition(withCrossFade())
+            .into(image);
  }

  public void setThumbnailClickListener(SlideClickListener listener) {
@@ -164,7 +167,7 @@ public class ThumbnailView extends FrameLayout {
  }

  public void clear() {
-    if (isContextValid())             Glide.clear(image);
+    if (isContextValid())             Glide.with(getContext()).clear(image);
    if (transferControls.isPresent()) getTransferControls().clear();

    slide = null;
@@ -181,24 +184,23 @@ public class ThumbnailView extends FrameLayout {
           !((Activity)getContext()).isDestroyed();
  }

-  private GenericRequestBuilder buildThumbnailGlideRequest(@NonNull Slide slide, @NonNull MasterSecret masterSecret) {
-    @SuppressWarnings("ConstantConditions")
-    DrawableRequestBuilder<DecryptableUri> builder = Glide.with(getContext())
-                                                          .load(new DecryptableUri(masterSecret, slide.getThumbnailUri()))
-                                                          .diskCacheStrategy(DiskCacheStrategy.NONE)
-                                                          .crossFade()
-                                                          .transform(new RoundedCorners(getContext(), true, radius, backgroundColorHint));
+  private RequestBuilder buildThumbnailGlideRequest(@NonNull Slide slide, @NonNull MasterSecret masterSecret) {
+    RequestBuilder builder = GlideApp.with(getContext())
+                                     .load(new DecryptableUri(masterSecret, slide.getThumbnailUri()))
+                                     .diskCacheStrategy(DiskCacheStrategy.NONE)
+                                     .transform(new RoundedCorners(radius))
+                                     .transition(withCrossFade());

    if (slide.isInProgress()) return builder;
-    else                      return builder.error(R.drawable.ic_missing_thumbnail_picture);
+    else                      return builder.apply(RequestOptions.errorOf(R.drawable.ic_missing_thumbnail_picture));
  }

-  private GenericRequestBuilder buildPlaceholderGlideRequest(Slide slide) {
-    return Glide.with(getContext())
-                .load(slide.getPlaceholderRes(getContext().getTheme()))
-                .asBitmap()
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .fitCenter();
+  private RequestBuilder buildPlaceholderGlideRequest(Slide slide) {
+    return GlideApp.with(getContext())
+                   .asBitmap()
+                   .load(slide.getPlaceholderRes(getContext().getTheme()))
+                   .diskCacheStrategy(DiskCacheStrategy.NONE)
+                   .fitCenter();
  }

  private class ThumbnailClickDispatcher implements View.OnClickListener {
--- a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java
+++ b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.components;

 import android.content.Context;
-import android.graphics.Canvas;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.support.annotation.Nullable;
@@ -10,37 +9,33 @@ import android.util.Log;
 import android.util.Pair;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.ImageView;

-import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.load.resource.drawable.GlideDrawable;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.GlideDrawableImageViewTarget;
 import com.bumptech.glide.request.target.Target;
 import com.davemorrissey.labs.subscaleview.ImageSource;
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView;
+import com.github.chrisbanes.photoview.PhotoView;

 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.subsampling.AttachmentBitmapDecoder;
 import org.thoughtcrime.securesms.components.subsampling.AttachmentRegionDecoder;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri;
+import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
+import org.thoughtcrime.securesms.util.MediaUtil;

 import java.io.IOException;
 import java.io.InputStream;

-import uk.co.senab.photoview.PhotoViewAttacher;

 public class ZoomingImageView extends FrameLayout {

  private static final String TAG = ZoomingImageView.class.getName();

-  private final ImageView                 imageView;
-  private final PhotoViewAttacher         imageViewAttacher;
+  private final PhotoView                 photoView;
  private final SubsamplingScaleImageView subsamplingImageView;

  public ZoomingImageView(Context context) {
@@ -56,9 +51,8 @@ public class ZoomingImageView extends FrameLayout {

    inflate(context, R.layout.zooming_image_view, this);

-    this.imageView            = (ImageView) findViewById(R.id.image_view);
-    this.subsamplingImageView = (SubsamplingScaleImageView) findViewById(R.id.subsampling_image_view);
-    this.imageViewAttacher     = new PhotoViewAttacher(imageView);
+    this.photoView            = findViewById(R.id.image_view);
+    this.subsamplingImageView = findViewById(R.id.subsampling_image_view);

    this.subsamplingImageView.setBitmapDecoderClass(AttachmentBitmapDecoder.class);
    this.subsamplingImageView.setRegionDecoderClass(AttachmentRegionDecoder.class);
@@ -74,7 +68,7 @@ public class ZoomingImageView extends FrameLayout {
    new AsyncTask<Void, Void, Pair<Integer, Integer>>() {
      @Override
      protected @Nullable Pair<Integer, Integer> doInBackground(Void... params) {
-        if (contentType.equals("image/gif")) return null;
+        if (MediaUtil.isGif(contentType)) return null;

        try {
          InputStream inputStream = PartAuthority.getAttachmentStream(context, masterSecret, uri);
@@ -100,32 +94,26 @@ public class ZoomingImageView extends FrameLayout {
  }

  private void setImageViewUri(MasterSecret masterSecret, Uri uri) {
+    photoView.setVisibility(View.VISIBLE);
    subsamplingImageView.setVisibility(View.GONE);
-    imageView.setVisibility(View.VISIBLE);

-    Glide.with(getContext())
-         .load(new DecryptableUri(masterSecret, uri))
-         .diskCacheStrategy(DiskCacheStrategy.NONE)
-         .dontTransform()
-         .dontAnimate()
-         .into(new GlideDrawableImageViewTarget(imageView) {
-           @Override protected void setResource(GlideDrawable resource) {
-             super.setResource(resource);
-             imageViewAttacher.update();
-           }
-         });
+    GlideApp.with(getContext())
+            .load(new DecryptableUri(masterSecret, uri))
+            .diskCacheStrategy(DiskCacheStrategy.NONE)
+            .dontTransform()
+            .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+            .into(photoView);
  }

  private void setSubsamplingImageViewUri(Uri uri) {
    subsamplingImageView.setVisibility(View.VISIBLE);
-    imageView.setVisibility(View.GONE);
+    photoView.setVisibility(View.GONE);

    subsamplingImageView.setImage(ImageSource.uri(uri));
  }

-
  public void cleanup() {
-    imageView.setImageDrawable(null);
+    photoView.setImageDrawable(null);
    subsamplingImageView.recycle();
  }
 }