empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Clear outstanding glide requests.

Browse source 
Fixes #8967
This commit is contained in:
Alan Evans 2019-08-02 16:00:22 -04:00 • committed by GitHub
parent dcc147d994
commit bdf93af3db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/components/AvatarImageView.java
View file

@ -5,7 +5,6 @@ import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Paint; import android.graphics.Paint;
import android.graphics.Path;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.util.AttributeSet; 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.ContactColors;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto; import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto; import org.thoughtcrime.securesms.contacts.avatars.ResourceContactPhoto;
import org.thoughtcrime.securesms.mms.GlideApp;
import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.GlideRequests;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientExporter; import org.thoughtcrime.securesms.recipients.RecipientExporter;
@ -28,8 +26,9 @@ import org.thoughtcrime.securesms.util.ThemeUtil;
import java.util.Objects; 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 String TAG = AvatarImageView.class.getSimpleName();
private static final Paint LIGHT_THEME_OUTLINE_PAINT = new Paint(); private static final Paint LIGHT_THEME_OUTLINE_PAINT = new Paint();
@ -100,6 +99,7 @@ public class AvatarImageView extends AppCompatImageView {
RecipientContactPhoto photo = new RecipientContactPhoto(recipient); RecipientContactPhoto photo = new RecipientContactPhoto(recipient);
if (!photo.equals(recipientContactPhoto)) { if (!photo.equals(recipientContactPhoto)) {
requestManager.clear(this);
recipientContactPhoto = photo; recipientContactPhoto = photo;
Drawable fallbackContactPhotoDrawable = photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted); Drawable fallbackContactPhotoDrawable = photo.recipient.getFallbackContactPhotoDrawable(getContext(), inverted);
@ -119,6 +119,7 @@ public class AvatarImageView extends AppCompatImageView {
setAvatarClickHandler(recipient, quickContactEnabled); setAvatarClickHandler(recipient, quickContactEnabled);
} else { } else {
recipientContactPhoto = null; recipientContactPhoto = null;
requestManager.clear(this);
setImageDrawable(unknownRecipientDrawable); setImageDrawable(unknownRecipientDrawable);
super.setOnClickListener(listener); super.setOnClickListener(listener);
} }