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

Add check to load thumbnail if it comes in late.

Browse source
This commit is contained in:
Alex Hart 2022-09-21 16:24:41 -03:00 • committed by Cody Henthorne
parent e676f324f1
commit c29922a575
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/stories/landing/StoriesLandingItem.kt
View file

@ -11,6 +11,7 @@ import com.bumptech.glide.load.DataSource
import com.bumptech.glide.load.engine.GlideException
import com.bumptech.glide.request.RequestListener
import com.bumptech.glide.request.target.Target
import org.signal.core.util.logging.Log
import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.avatar.view.AvatarView
import org.thoughtcrime.securesms.badges.BadgeImageView
@ -61,6 +62,7 @@ object StoriesLandingItem {
return data.storyRecipient.hasSameContent(newItem.data.storyRecipient) &&
data == newItem.data &&
!hasStatusChange(newItem) &&
!hasThumbChange(newItem) &&
(data.sendingCount == newItem.data.sendingCount && data.failureCount == newItem.data.failureCount) &&
data.storyViewState == newItem.data.storyViewState
}
@ -85,10 +87,31 @@ object StoriesLandingItem {
newRecord.isOutgoing &&
(oldRecord.isPending != newRecord.isPending || oldRecord.isSent != newRecord.isSent || oldRecord.isFailed != newRecord.isFailed)
}
private fun hasThumbChange(newItem: Model): Boolean {
val oldRecord = data.primaryStory.messageRecord as? MediaMmsMessageRecord ?: return false
val newRecord = newItem.data.primaryStory.messageRecord as? MediaMmsMessageRecord ?: return false
val oldThumb = oldRecord.slideDeck.thumbnailSlide?.uri
val newThumb = newRecord.slideDeck.thumbnailSlide?.uri
if (oldThumb != newThumb) {
return true
}
val oldBlur = oldRecord.slideDeck.thumbnailSlide?.placeholderBlur
val newBlur = newRecord.slideDeck.thumbnailSlide?.placeholderBlur
return oldBlur != newBlur
}
}
private class ViewHolder(itemView: View) : MappingViewHolder<Model>(itemView) {
companion object {
private val TAG = Log.tag(ViewHolder::class.java)
}
private val avatarView: AvatarView = itemView.findViewById(R.id.avatar)
private val badgeView: BadgeImageView = itemView.findViewById(R.id.badge)
private val storyPreview: ImageView = itemView.findViewById<ImageView>(R.id.story).apply {
@ -131,6 +154,10 @@ object StoriesLandingItem {
val thumbnail = record.slideDeck.thumbnailSlide?.uri
val blur = record.slideDeck.thumbnailSlide?.placeholderBlur
if (thumbnail == null && blur == null && !record.storyType.isTextStory) {
Log.w(TAG, "Story[${record.dateSent}] has no thumbnail and no blur!")
}
clearGlide()
storyBlur.visible = blur != null
if (blur != null) {