From f34c5d6674f5c97c6a888f35e617a9c4dae66929 Mon Sep 17 00:00:00 2001 From: Valere Date: Mon, 31 Aug 2020 17:50:17 +0200 Subject: [PATCH] Crash / Attachment viewer: Cannot draw a recycled Bitmap --- CHANGES.md | 1 + .../lib/attachmentviewer/AnimatedImageViewHolder.kt | 5 +++++ .../im/vector/lib/attachmentviewer/ImageLoaderTarget.kt | 3 +++ .../im/vector/lib/attachmentviewer/VideoLoaderTarget.kt | 2 ++ .../im/vector/lib/attachmentviewer/VideoViewHolder.kt | 8 +++++++- .../lib/attachmentviewer/ZoomableImageViewHolder.kt | 5 +++++ 6 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 1ffb6bcad0..26b06237d2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,7 @@ Bugfix 🐛: - Change user or room avatar: when selecting Gallery, I'm not proposed to crop the selected image (#1590) - Fix uploads still don't work with room v6 (#1879) - Can't handle ongoing call events in background (#1992) + - Crash / Attachment viewer: Cannot draw a recycled Bitmap #2034 Translations 🗣: - diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt index 6b7818c612..96e6c92467 100644 --- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/AnimatedImageViewHolder.kt @@ -27,4 +27,9 @@ class AnimatedImageViewHolder constructor(itemView: View) : val imageLoaderProgress: ProgressBar = itemView.findViewById(R.id.imageLoaderProgress) internal val target = DefaultImageLoaderTarget(this, this.touchImageView) + + override fun onRecycled() { + super.onRecycled() + touchImageView.setImageDrawable(null) + } } diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt index 1e5e88d91f..9166c2ce4f 100644 --- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ImageLoaderTarget.kt @@ -50,6 +50,7 @@ internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, pri override fun onLoadFailed(uid: String, errorDrawable: Drawable?) { if (holder.boundResourceUid != uid) return holder.imageLoaderProgress.isVisible = false + holder.touchImageView.setImageDrawable(errorDrawable) } override fun onResourceCleared(uid: String, placeholder: Drawable?) { @@ -77,11 +78,13 @@ internal class DefaultImageLoaderTarget(val holder: AnimatedImageViewHolder, pri override fun onResourceLoading(uid: String, placeholder: Drawable?) { if (holder.boundResourceUid != uid) return holder.imageLoaderProgress.isVisible = true + holder.touchImageView.setImageDrawable(placeholder) } override fun onLoadFailed(uid: String, errorDrawable: Drawable?) { if (holder.boundResourceUid != uid) return holder.imageLoaderProgress.isVisible = false + holder.touchImageView.setImageDrawable(errorDrawable) } override fun onResourceCleared(uid: String, placeholder: Drawable?) { diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt index 78f46a320f..65e37ed39e 100644 --- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoLoaderTarget.kt @@ -47,6 +47,8 @@ internal class DefaultVideoLoaderTarget(val holder: VideoViewHolder, private val } override fun onThumbnailResourceCleared(uid: String, placeholder: Drawable?) { + if (holder.boundResourceUid != uid) return + holder.thumbnailImage.setImageDrawable(placeholder) } override fun onThumbnailResourceReady(uid: String, resource: Drawable) { diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt index 32f449d6fe..621f04426d 100644 --- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt @@ -16,6 +16,7 @@ package im.vector.lib.attachmentviewer +import android.util.Log import android.view.View import android.widget.ImageView import android.widget.ProgressBar @@ -118,8 +119,13 @@ class VideoViewHolder constructor(itemView: View) : eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration)) } } + try { + videoView.setVideoPath(mVideoPath) + } catch (failure: Throwable) { + // Couldn't open + Log.v(VideoViewHolder::class.java.name, "Failed to start video ${failure.message}") + } - videoView.setVideoPath(mVideoPath) if (!wasPaused) { videoView.start() if (progress > 0) { diff --git a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt index 019cd3202d..49378631e8 100644 --- a/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt +++ b/attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/ZoomableImageViewHolder.kt @@ -39,4 +39,9 @@ class ZoomableImageViewHolder constructor(itemView: View) : } internal val target = DefaultImageLoaderTarget.ZoomableImageTarget(this, touchImageView) + + override fun onRecycled() { + super.onRecycled() + touchImageView.setImageDrawable(null) + } }