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

Fix a few glide issues.

Browse source
This commit is contained in:
Alex Hart 2021-11-01 13:32:03 -03:00 • committed by Greyson Parrelli
parent e02c8b9db7
commit deca8e3feb
3 changed files with 45 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/OverlayTransformation.kt
View file

@ -13,8 +13,11 @@ import java.security.MessageDigest
class OverlayTransformation(
@ColorInt private val color: Int
) : BitmapTransformation() {
private val id = "${OverlayTransformation::class.java.name}$color"
override fun updateDiskCacheKey(messageDigest: MessageDigest) {
messageDigest.update("${OverlayTransformation::class.java.name}$color".toByteArray(CHARSET))
messageDigest.update(id.toByteArray(CHARSET))
}
override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {
@ -26,4 +29,12 @@ class OverlayTransformation(
return outBitmap
}
override fun equals(other: Any?): Boolean {
return (other as? OverlayTransformation)?.color == color
}
override fun hashCode(): Int {
return id.hashCode()
}
}

12
app/src/main/java/org/thoughtcrime/securesms/badges/glide/BadgeSpriteTransformation.kt
View file

@ -16,8 +16,18 @@ class BadgeSpriteTransformation(
private val isDarkTheme: Boolean
) : BitmapTransformation() {
private val id = "BadgeSpriteTransformation(${size.code},$density,$isDarkTheme).$VERSION"
override fun updateDiskCacheKey(messageDigest: MessageDigest) {
messageDigest.update("BadgeSpriteTransformation(${size.code},$density,$isDarkTheme).$VERSION".toByteArray(CHARSET))
messageDigest.update(id.toByteArray(CHARSET))
}
override fun equals(other: Any?): Boolean {
return (other as? BadgeSpriteTransformation)?.id == id
}
override fun hashCode(): Int {
return id.hashCode()
}
override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap {

31
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListItem.java
View file

@ -31,6 +31,7 @@ import androidx.annotation.ColorInt;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.Px;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.core.content.ContextCompat;
import androidx.lifecycle.LiveData;
@ -116,6 +117,8 @@ public final class ConversationListItem extends ConstraintLayout
private View checkContainer;
private View uncheckedView;
private View checkedView;
private int thumbSize;
private GlideLiveDataTarget thumbTarget;
private int unreadCount;
private AvatarImageView contactPhotoImage;
@ -148,6 +151,8 @@ public final class ConversationListItem extends ConstraintLayout
this.checkContainer = findViewById(R.id.conversation_list_item_check_container);
this.uncheckedView = findViewById(R.id.conversation_list_item_unchecked);
this.checkedView = findViewById(R.id.conversation_list_item_checked);
this.thumbSize = (int) DimensionUnit.SP.toPixels(20f);
this.thumbTarget = new GlideLiveDataTarget(thumbSize, thumbSize);
getLayoutTransition().setDuration(150);
}
@ -195,7 +200,7 @@ public final class ConversationListItem extends ConstraintLayout
this.typingThreads = typingThreads;
updateTypingIndicator(typingThreads);
observeDisplayBody(getThreadDisplayBody(getContext(), thread, glideRequests));
observeDisplayBody(getThreadDisplayBody(getContext(), thread, glideRequests, thumbSize, thumbTarget));
if (thread.getDate() > 0) {
CharSequence date = DateUtils.getBriefRelativeTimeSpanString(getContext(), locale, thread.getDate());
@ -353,6 +358,10 @@ public final class ConversationListItem extends ConstraintLayout
}
private void observeDisplayBody(@Nullable LiveData<SpannableString> displayBody) {
if (displayBody == null) {
glideRequests.clear(thumbTarget);
}
if (this.displayBody != null) {
this.displayBody.removeObserver(this);
}
@ -441,7 +450,12 @@ public final class ConversationListItem extends ConstraintLayout
badge.setBadgeFromRecipient(recipient);
}
private static @NonNull LiveData<SpannableString> getThreadDisplayBody(@NonNull Context context, @NonNull ThreadRecord thread, @NonNull GlideRequests glideRequests) {
private static @NonNull LiveData<SpannableString> getThreadDisplayBody(@NonNull Context context,
@NonNull ThreadRecord thread,
@NonNull GlideRequests glideRequests,
@Px int thumbSize,
@NonNull GlideLiveDataTarget thumbTarget)
{
int defaultTint = ContextCompat.getColor(context, R.color.signal_text_secondary);
if (!thread.isMessageRequestAccepted()) {
@ -514,7 +528,7 @@ public final class ConversationListItem extends ConstraintLayout
return emphasisAdded(context, context.getString(thread.isOutgoing() ? R.string.ThreadRecord_you_deleted_this_message : R.string.ThreadRecord_this_message_was_deleted), defaultTint);
} else {
String body = removeNewlines(thread.getBody());
LiveData<SpannableString> finalBody = LiveDataUtil.mapAsync(createFinalBodyWithMediaIcon(context, body, thread, glideRequests), updatedBody -> {
LiveData<SpannableString> finalBody = LiveDataUtil.mapAsync(createFinalBodyWithMediaIcon(context, body, thread, glideRequests, thumbSize, thumbTarget), updatedBody -> {
if (thread.getRecipient().isGroup()) {
RecipientId groupMessageSender = thread.getGroupMessageSender();
if (!groupMessageSender.isUnknown()) {
@ -533,7 +547,9 @@ public final class ConversationListItem extends ConstraintLayout
private static LiveData<CharSequence> createFinalBodyWithMediaIcon(@NonNull Context context,
@NonNull String body,
@NonNull ThreadRecord thread,
@NonNull GlideRequests glideRequests)
@NonNull GlideRequests glideRequests,
@Px int thumbSize,
@NonNull GlideLiveDataTarget thumbTarget)
{
if (thread.getSnippetUri() == null) {
return LiveDataUtil.just(body);
@ -553,9 +569,6 @@ public final class ConversationListItem extends ConstraintLayout
return LiveDataUtil.just(body);
}
int thumbSize = (int) DimensionUnit.SP.toPixels(20f);
GlideLiveDataTarget target = new GlideLiveDataTarget(thumbSize, thumbSize);
glideRequests.asBitmap()
.load(new DecryptableStreamUriLoader.DecryptableUri(thread.getSnippetUri()))
.override(thumbSize, thumbSize)
@ -563,9 +576,9 @@ public final class ConversationListItem extends ConstraintLayout
new OverlayTransformation(ContextCompat.getColor(context, R.color.transparent_black_08)),
new CenterCrop()
)
.into(target);
.into(thumbTarget);
return Transformations.map(target.getLiveData(), bitmap -> {
return Transformations.map(thumbTarget.getLiveData(), bitmap -> {
if (bitmap == null) {
return body;
}