From e5adf174a8e745dfa01a2233415244fb88432ba3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 5 Jul 2019 17:00:57 +0200 Subject: [PATCH] Fix crash when invalid urls for image --- .../im/vector/riotx/features/media/ImageContentRenderer.kt | 6 ++++++ 1 file changed, 6 insertions(+) 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 0f92cbff..412043e8 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 @@ -28,6 +28,7 @@ import im.vector.riotx.core.di.ActiveSessionHolder import im.vector.riotx.core.glide.GlideApp import im.vector.riotx.core.utils.DimensionUtils.dpToPx import kotlinx.android.parcel.Parcelize +import timber.log.Timber import java.io.File import javax.inject.Inject @@ -94,6 +95,11 @@ class ImageContentRenderer @Inject constructor(private val activeSessionHolder: val fullSize = contentUrlResolver.resolveFullSize(data.url) val thumbnail = contentUrlResolver.resolveThumbnail(data.url, width, height, ContentUrlResolver.ThumbnailMethod.SCALE) + if (fullSize.isNullOrBlank() || thumbnail.isNullOrBlank()) { + Timber.w("Invalid urls") + return + } + // TODO DECRYPT_FILE Decrypt file imageView.showImage( Uri.parse(thumbnail),