Update giphy connectivity strategy for glide

// FREEBIE

Author: moxie0

src/org/thoughtcrime/securesms/giph/model/GiphyImage.java

@@ -12,10 +12,18 @@ public String getGifUrl() {
     return images.downsized.url;
   }
 
+  public long getGifSize() {
+    return images.downsized.size;
+  }
+
   public String getGifMmsUrl() {
     return images.fixed_height_downsampled.url;
   }
 
+  public long getMmsGifSize() {
+    return images.fixed_height_downsampled.size;
+  }
+
   public float getGifAspectRatio() {
     return (float)images.downsized.width / (float)images.downsized.height;
   }
@@ -24,6 +32,10 @@ public String getStillUrl() {
     return images.downsized_still.url;
   }
 
+  public long getStillSize() {
+    return images.downsized_still.size;
+  }
+
   public static class ImageTypes {
     @JsonProperty
     private ImageData fixed_height;

src/org/thoughtcrime/securesms/giph/model/GiphyPaddedUrl.java

@@ -0,0 +1,50 @@
+package org.thoughtcrime.securesms.giph.model;
+
+
+import android.support.annotation.NonNull;
+
+import com.bumptech.glide.load.Key;
+
+import org.thoughtcrime.securesms.util.Conversions;
+
+import java.security.MessageDigest;
+
+public class GiphyPaddedUrl implements Key {
+
+  private final String target;
+  private final long   size;
+
+  public GiphyPaddedUrl(@NonNull String target, long size) {
+    this.target = target;
+    this.size   = size;
+  }
+
+  public String getTarget() {
+    return target;
+  }
+
+  public long getSize() {
+    return size;
+  }
+
+  @Override
+  public void updateDiskCacheKey(MessageDigest messageDigest) {
+    messageDigest.update(target.getBytes());
+    messageDigest.update(Conversions.longToByteArray(size));
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    if (other == null || !(other instanceof GiphyPaddedUrl)) return false;
+
+    GiphyPaddedUrl that = (GiphyPaddedUrl)other;
+
+    return this.target.equals(that.target) && this.size == that.size;
+  }
+
+  @Override
+  public int hashCode() {
+    return target.hashCode() ^ (int)size;
+  }
+
+}

src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java

@@ -24,12 +24,15 @@
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.color.MaterialColor;
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
+import org.thoughtcrime.securesms.giph.model.GiphyPaddedUrl;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.PrintWriter;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
@@ -69,7 +72,7 @@ public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Dra
       Log.w(TAG, e);
 
       synchronized (this) {
-        if (image.getGifUrl().equals(model)) {
+        if (new GiphyPaddedUrl(image.getGifUrl(), image.getGifSize()).equals(model)) {
           this.modelReady = true;
           notifyAll();
         }
@@ -81,7 +84,7 @@ public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Dra
     @Override
     public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
       synchronized (this) {
-        if (image.getGifUrl().equals(model)) {
+        if (new GiphyPaddedUrl(image.getGifUrl(), image.getGifSize()).equals(model)) {
           this.modelReady = true;
           notifyAll();
         }
@@ -99,7 +102,8 @@ public File getFile(boolean forMms) throws ExecutionException, InterruptedExcept
       }
 
       return Glide.with(context)
-                  .load(forMms ? image.getGifMmsUrl() : image.getGifUrl())
+                  .load(forMms ? new GiphyPaddedUrl(image.getGifMmsUrl(), image.getMmsGifSize()) :
+                                 new GiphyPaddedUrl(image.getGifUrl(), image.getGifSize()))
                   .downloadOnly(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
                   .get();
     }
@@ -144,18 +148,19 @@ public void onBindViewHolder(GiphyViewHolder holder, int position) {
     holder.gifProgress.setVisibility(View.GONE);
 
     RequestBuilder<Drawable> thumbnailRequest = GlideApp.with(context)
-                                                        .load(image.getStillUrl())
+                                                        .load(new GiphyPaddedUrl(image.getStillUrl(), image.getStillSize()))
                                                         .diskCacheStrategy(DiskCacheStrategy.ALL);
 
     if (Util.isLowMemory(context)) {
-      glideRequests.load(image.getStillUrl())
+      glideRequests.load(new GiphyPaddedUrl(image.getStillUrl(), image.getStillSize()))
                    .placeholder(new ColorDrawable(Util.getRandomElement(MaterialColor.values()).toConversationColor(context)))
                    .diskCacheStrategy(DiskCacheStrategy.ALL)
+                   .listener(holder)
                    .into(holder.thumbnail);
 
       holder.setModelReady();
     } else {
-      glideRequests.load(image.getGifUrl())
+      glideRequests.load(new GiphyPaddedUrl(image.getGifUrl(), image.getGifSize()))
                    .thumbnail(thumbnailRequest)
                    .placeholder(new ColorDrawable(Util.getRandomElement(MaterialColor.values()).toConversationColor(context)))
                    .diskCacheStrategy(DiskCacheStrategy.ALL)