Skip to content

Commit 9d0fe46

Browse files
ImageContentRenderer: Enable image animation if enabled in preferences
This patch removes dontAnimate() in the createGlideRequest() builder conditionally depending on the user's animated image autoplay preferences. Resolves element-hq#1160, element-hq#5094 Signed-off-by: networkException <[email protected]>
1 parent 9b60ee7 commit 9d0fe46

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

vector/src/main/java/im/vector/app/features/media/ImageContentRenderer.kt

+7-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import im.vector.app.core.glide.GlideRequest
4141
import im.vector.app.core.glide.GlideRequests
4242
import im.vector.app.core.ui.model.Size
4343
import im.vector.app.core.utils.DimensionConverter
44+
import im.vector.app.features.settings.VectorPreferences
4445
import kotlinx.parcelize.Parcelize
4546
import org.matrix.android.sdk.api.extensions.tryOrNull
4647
import org.matrix.android.sdk.api.session.content.ContentUrlResolver
@@ -67,7 +68,8 @@ private const val URL_PREVIEW_IMAGE_MIN_FULL_HEIGHT_PX = 315
6768

6869
class ImageContentRenderer @Inject constructor(private val localFilesHelper: LocalFilesHelper,
6970
private val activeSessionHolder: ActiveSessionHolder,
70-
private val dimensionConverter: DimensionConverter) {
71+
private val dimensionConverter: DimensionConverter,
72+
private val vectorPreferences: VectorPreferences) {
7173

7274
@Parcelize
7375
data class Data(
@@ -133,7 +135,10 @@ class ImageContentRenderer @Inject constructor(private val localFilesHelper: Loc
133135
imageView.contentDescription = data.filename
134136

135137
createGlideRequest(data, mode, imageView, size)
136-
.dontAnimate()
138+
.let {
139+
if (vectorPreferences.autoplayAnimatedImages()) it
140+
else it.dontAnimate()
141+
}
137142
.transform(cornerTransformation)
138143
// .thumbnail(0.3f)
139144
.into(imageView)

0 commit comments

Comments
 (0)