Skip to content

Fixes large images crashing when opened in timeline #6290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6290.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed crash when opening large images in the timeline
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package im.vector.app.features.media

import android.graphics.Bitmap
import android.graphics.drawable.Drawable
import android.net.Uri
import android.os.Parcelable
import android.view.View
import android.widget.ImageView
Expand All @@ -31,8 +30,6 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners
import com.bumptech.glide.request.RequestListener
import com.bumptech.glide.request.target.CustomViewTarget
import com.bumptech.glide.request.target.Target
import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView.ORIENTATION_USE_EXIF
import com.github.piasy.biv.view.BigImageView
import im.vector.app.R
import im.vector.app.core.di.ActiveSessionHolder
import im.vector.app.core.files.LocalFilesHelper
Expand All @@ -47,8 +44,6 @@ import org.matrix.android.sdk.api.extensions.tryOrNull
import org.matrix.android.sdk.api.session.content.ContentUrlResolver
import org.matrix.android.sdk.api.session.crypto.attachments.ElementToDecrypt
import org.matrix.android.sdk.api.session.media.PreviewUrlData
import timber.log.Timber
import java.io.File
import javax.inject.Inject
import kotlin.math.min

Expand Down Expand Up @@ -142,7 +137,6 @@ class ImageContentRenderer @Inject constructor(
else it.dontAnimate()
}
.transform(cornerTransformation)
// .thumbnail(0.3f)
.into(imageView)
}

Expand Down Expand Up @@ -173,47 +167,11 @@ class ImageContentRenderer @Inject constructor(
.load(resolvedUrl)
}

req.override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
req
.fitCenter()
.into(target)
}

fun renderFitTarget(data: Data, mode: Mode, imageView: ImageView, callback: ((Boolean) -> Unit)? = null) {
val size = processSize(data, mode)

// a11y
imageView.contentDescription = data.filename

createGlideRequest(data, mode, imageView, size)
.listener(object : RequestListener<Drawable> {
override fun onLoadFailed(
e: GlideException?,
model: Any?,
target: Target<Drawable>?,
isFirstResource: Boolean
): Boolean {
callback?.invoke(false)
return false
}

override fun onResourceReady(
resource: Drawable?,
model: Any?,
target: Target<Drawable>?,
dataSource: DataSource?,
isFirstResource: Boolean
): Boolean {
callback?.invoke(true)
return false
}
})
.fitCenter()
.into(imageView)
}

/**
* onlyRetrieveFromCache is true!
*/
fun renderForSharedElementTransition(data: Data, imageView: ImageView, callback: ((Boolean) -> Unit)? = null) {
// a11y
imageView.contentDescription = data.filename
Expand Down Expand Up @@ -254,7 +212,6 @@ class ImageContentRenderer @Inject constructor(
return false
}
})
.onlyRetrieveFromCache(true)
.fitCenter()
.into(imageView)
}
Expand Down Expand Up @@ -292,32 +249,6 @@ class ImageContentRenderer @Inject constructor(
}
}

fun render(data: Data, imageView: BigImageView) {
// a11y
imageView.contentDescription = data.filename

val (width, height) = processSize(data, Mode.THUMBNAIL)
val contentUrlResolver = activeSessionHolder.getActiveSession().contentUrlResolver()
val fullSize = resolveUrl(data)
val thumbnail = contentUrlResolver.resolveThumbnail(data.url, width, height, ContentUrlResolver.ThumbnailMethod.SCALE)

if (fullSize.isNullOrBlank() || thumbnail.isNullOrBlank()) {
Timber.w("Invalid urls")
return
}

imageView.setImageLoaderCallback(object : DefaultImageLoaderCallback {
override fun onSuccess(image: File?) {
imageView.ssiv?.orientation = ORIENTATION_USE_EXIF
}
})

imageView.showImage(
Uri.parse(thumbnail),
Uri.parse(fullSize)
)
}

private fun resolveUrl(data: Data) =
(activeSessionHolder.getActiveSession().contentUrlResolver().resolveFullSize(data.url)
?: data.url?.takeIf { localFilesHelper.isLocalFile(data.url) && data.allowNonMxcUrls })
Expand Down