From bdf93af3db17c18f0d0fd886defc9c38b09fdc6c Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Fri, 2 Aug 2019 16:00:22 -0400
Subject: [PATCH] Clear outstanding glide requests.

Fixes #8967
---
 .../thoughtcrime/securesms/components/AvatarImageView.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
index 30c187cdfb..becf386e91 100644
--- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -5,7 +5,6 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Path;
 import android.graphics.drawable.Drawable;
 import android.provider.ContactsContract;
 import android.util.AttributeSet;
@@ -20,7 +19,6 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
 import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
 import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
-import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientExporter;
@@ -28,8 +26,9 @@ import org.thoughtcrime.securesms.util.ThemeUtil;
 
 import java.util.Objects;
 
-public class AvatarImageView extends AppCompatImageView {
+public final class AvatarImageView extends AppCompatImageView {
 
+  @SuppressWarnings("unused")
   private static final String TAG = AvatarImageView.class.getSimpleName();
 
   private static final Paint LIGHT_THEME_OUTLINE_PAINT = new Paint();
@@ -100,6 +99,7 @@ public class AvatarImageView extends AppCompatImageView {
       RecipientContactPhoto photo = new RecipientContactPhoto(recipient);
 
       if (!photo.equals(recipientContactPhoto)) {
+        requestManager.clear(this);
         recipientContactPhoto = photo;
 
         Drawable fallbackContactPhotoDrawable = photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted);
@@ -119,6 +119,7 @@ public class AvatarImageView extends AppCompatImageView {
       setAvatarClickHandler(recipient, quickContactEnabled);
     } else {
       recipientContactPhoto = null;
+      requestManager.clear(this);
       setImageDrawable(unknownRecipientDrawable);
       super.setOnClickListener(listener);
     }