Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix #300 in manner suggested by dansup 

"you should be using url if preview_url returns public/no-preview.png or stick with url. The issue is a race condition and caching"
This commit is contained in:
Matthieu 2021-09-22 23:28:03 +02:00
parent 6e7b1a63d7
commit 2e3d912cdc
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsFragment.kt
View File

@ -172,7 +172,7 @@ class NotificationsFragment : CachedFeedFragment<Notification>() {
Glide.with(itemView).load(notification?.account?.anyAvatar()).circleCrop() Glide.with(itemView).load(notification?.account?.anyAvatar()).circleCrop()
.into(avatar) .into(avatar)
val previewUrl = notification?.status?.media_attachments?.getOrNull(0)?.preview_url val previewUrl = notification?.status?.getPostPreviewURL()
if (!previewUrl.isNullOrBlank()) { if (!previewUrl.isNullOrBlank()) {
Glide.with(itemView).load(previewUrl) Glide.with(itemView).load(previewUrl)
.placeholder(R.drawable.ic_picture_fallback).into(photoThumbnail) .placeholder(R.drawable.ic_picture_fallback).into(photoThumbnail)

2
app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt
View File

@ -121,7 +121,7 @@ class SearchDiscoverFragment : BaseFragment() {
} else { } else {
holder.albumIcon.visibility = View.GONE holder.albumIcon.visibility = View.GONE
} }
ImageConverter.setSquareImageFromURL(holder.postView, post?.media_attachments?.firstOrNull()?.preview_url, holder.postPreview, post?.media_attachments?.firstOrNull()?.blurhash) ImageConverter.setSquareImageFromURL(holder.postView, post?.getPostPreviewURL(), holder.postPreview, post?.media_attachments?.firstOrNull()?.blurhash)
holder.postPreview.setOnClickListener { holder.postPreview.setOnClickListener {
val intent = Intent(holder.postView.context, PostActivity::class.java) val intent = Intent(holder.postView.context, PostActivity::class.java)
intent.putExtra(Status.POST_TAG, post) intent.putExtra(Status.POST_TAG, post)

4
app/src/main/java/org/pixeldroid/app/utils/api/objects/Attachment.kt
View File

@ -38,4 +38,8 @@ data class Attachment(
val aspect: Double? val aspect: Double?
) : Serializable ) : Serializable
} }
val previewNoPlaceholder: String?
get() = if (preview_url?.contains(Regex("public/no-preview\\.(png|jpg|webp)")) == true) url else preview_url
} }

2
app/src/main/java/org/pixeldroid/app/utils/api/objects/Status.kt
View File

@ -65,7 +65,7 @@ open class Status(
fun getPostUrl() : String? = media_attachments?.firstOrNull()?.url fun getPostUrl() : String? = media_attachments?.firstOrNull()?.url
fun getProfilePicUrl() : String? = account?.anyAvatar() fun getProfilePicUrl() : String? = account?.anyAvatar()
fun getPostPreviewURL() : String? = media_attachments?.firstOrNull()?.preview_url fun getPostPreviewURL() : String? = media_attachments?.firstOrNull()?.previewNoPlaceholder
fun getNLikes(context: Context) : CharSequence { fun getNLikes(context: Context) : CharSequence {