From c63128cfbd97fcb7ce01511461df7736fb2167c0 Mon Sep 17 00:00:00 2001 From: Valere Date: Mon, 13 Jul 2020 09:15:52 +0200 Subject: [PATCH] Fix / view attachment crash + freeze when offline --- .../vector/riotx/features/media/ImageContentRenderer.kt | 8 ++++++-- .../features/media/VectorAttachmentViewerActivity.kt | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt b/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt index f7613855c5..f9cb6ec3dc 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/ImageContentRenderer.kt @@ -151,7 +151,10 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder: .into(imageView) } - fun renderThumbnailDontTransform(data: Data, imageView: ImageView, callback: ((Boolean) -> Unit)? = null) { + /** + * onlyRetrieveFromCache is true! + */ + fun renderForSharedElementTransition(data: Data, imageView: ImageView, callback: ((Boolean) -> Unit)? = null) { // a11y imageView.contentDescription = data.filename @@ -186,7 +189,8 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder: return false } }) - .dontTransform() + .onlyRetrieveFromCache(true) + .fitCenter() .into(imageView) } diff --git a/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt b/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt index 38e3ccc69c..9e5facd162 100644 --- a/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt +++ b/vector/src/main/java/im/vector/riotx/features/media/VectorAttachmentViewerActivity.kt @@ -96,7 +96,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen // will be shown at end of transition pager2.isInvisible = true supportPostponeEnterTransition() - imageContentRenderer.renderThumbnailDontTransform(mediaData, imageTransitionView) { + imageContentRenderer.renderForSharedElementTransition(mediaData, imageTransitionView) { // Proceed with transaction scheduleStartPostponedTransition(imageTransitionView) } @@ -104,7 +104,7 @@ class VectorAttachmentViewerActivity : AttachmentViewerActivity(), BaseAttachmen // will be shown at end of transition pager2.isInvisible = true supportPostponeEnterTransition() - imageContentRenderer.renderThumbnailDontTransform(mediaData.thumbnailMediaData, imageTransitionView) { + imageContentRenderer.renderForSharedElementTransition(mediaData.thumbnailMediaData, imageTransitionView) { // Proceed with transaction scheduleStartPostponedTransition(imageTransitionView) }