diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryCache.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryCache.kt index 8a55871cb0..d5dedd3994 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryCache.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/page/StoryCache.kt @@ -5,6 +5,7 @@ import android.net.Uri import com.bumptech.glide.Priority import com.bumptech.glide.request.target.CustomTarget import com.bumptech.glide.request.transition.Transition +import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.attachments.Attachment import org.thoughtcrime.securesms.database.AttachmentDatabase import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader @@ -19,6 +20,11 @@ class StoryCache( private val glideRequests: GlideRequests, private val storySize: StoryDisplay.Size ) { + + companion object { + private val TAG = Log.tag(StoryCache::class.java) + } + private val cache = mutableMapOf() /** @@ -26,6 +32,8 @@ class StoryCache( * downloaded, not images, or already in progress. */ fun prefetch(attachments: List) { + Log.d(TAG, "Loading ${attachments.size} attachments at $storySize") + val prefetchableAttachments: List = attachments .asSequence() .filter { it.uri != null && it.uri !in cache } @@ -38,8 +46,11 @@ class StoryCache( glideRequests .load(DecryptableStreamUriLoader.DecryptableUri(attachment.uri!!)) .priority(Priority.HIGH) + .centerInside() .into(StoryCacheTarget(attachment.uri!!, storySize)) - } else null + } else { + null + } val blurTarget = if (attachment.blurHash != null) { glideRequests diff --git a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryImageLoader.kt b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryImageLoader.kt index 023ba19014..c44405e00c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryImageLoader.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/stories/viewer/post/StoryImageLoader.kt @@ -46,6 +46,7 @@ class StoryImageLoader( private val imageListener = object : StoryCache.Listener { override fun onResourceReady(resource: Drawable) { + Log.d(TAG, "Loaded cached resource of size w${resource.intrinsicWidth} x h${resource.intrinsicHeight}") postImage.setImageDrawable(resource) imageState = LoadState.READY notifyListeners() @@ -89,6 +90,7 @@ class StoryImageLoader( GlideApp.with(postImage) .load(DecryptableStreamUriLoader.DecryptableUri(imagePost.imageUri)) .override(storySize.width, storySize.height) + .centerInside() .addListener(object : RequestListener { override fun onLoadFailed(e: GlideException?, model: Any?, target: Target?, isFirstResource: Boolean): Boolean { imageState = LoadState.FAILED