From d33f5543b69da7bea45144696b3333ac8443253c Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 13 Feb 2024 00:01:57 +0100
Subject: [PATCH] Test that blurhash is correctly used and fix issue on
 StickerContent.

---
 .../impl/timeline/model/InReplyToMetadata.kt  |  3 +-
 .../timeline/model/InReplyToMetadataKtTest.kt | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt
index bbf36afa36..7929367be5 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadata.kt
@@ -114,7 +114,8 @@ internal fun InReplyToDetails.metadata(): InReplyToMetadata? = when (eventConten
         AttachmentThumbnailInfo(
             thumbnailSource = MediaSource(eventContent.url),
             textContent = eventContent.body,
-            type = AttachmentThumbnailType.Image
+            type = AttachmentThumbnailType.Image,
+            blurHash = eventContent.info.blurhash,
         )
     )
     is PollContent -> InReplyToMetadata.Thumbnail(
diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadataKtTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadataKtTest.kt
index a89b0cce5e..11dc75b015 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadataKtTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToMetadataKtTest.kt
@@ -55,6 +55,7 @@ import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.media.aMediaSource
 import io.element.android.libraries.matrix.test.timeline.aMessageContent
 import io.element.android.libraries.matrix.test.timeline.aPollContent
+import io.element.android.libraries.matrix.ui.components.A_BLUR_HASH
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailInfo
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnailType
 import kotlinx.coroutines.test.runTest
@@ -82,7 +83,7 @@ class InReplyToMetadataKtTest {
                     messageType = ImageMessageType(
                         body = "body",
                         source = aMediaSource(),
-                        info = null,
+                        info = anImageInfo(),
                     )
                 )
             ).metadata()
@@ -94,7 +95,7 @@ class InReplyToMetadataKtTest {
                             thumbnailSource = aMediaSource(),
                             textContent = "body",
                             type = AttachmentThumbnailType.Image,
-                            blurHash = null,
+                            blurHash = A_BLUR_HASH,
                         )
                     )
                 )
@@ -108,15 +109,7 @@ class InReplyToMetadataKtTest {
             anInReplyToDetails(
                 eventContent = StickerContent(
                     body = "body",
-                    info = ImageInfo(
-                        height = null,
-                        width = null,
-                        mimetype = null,
-                        size = null,
-                        thumbnailInfo = null,
-                        thumbnailSource = aMediaSource(),
-                        blurhash = null
-                    ),
+                    info = anImageInfo(),
                     url = "url"
                 )
             ).metadata()
@@ -128,7 +121,7 @@ class InReplyToMetadataKtTest {
                             thumbnailSource = aMediaSource(url = "url"),
                             textContent = "body",
                             type = AttachmentThumbnailType.Image,
-                            blurHash = null,
+                            blurHash = A_BLUR_HASH,
                         )
                     )
                 )
@@ -152,7 +145,7 @@ class InReplyToMetadataKtTest {
                             size = null,
                             thumbnailInfo = null,
                             thumbnailSource = aMediaSource(),
-                            blurhash = null
+                            blurhash = A_BLUR_HASH
                         ),
                     )
                 )
@@ -165,7 +158,7 @@ class InReplyToMetadataKtTest {
                             thumbnailSource = aMediaSource(),
                             textContent = "body",
                             type = AttachmentThumbnailType.Video,
-                            blurHash = null,
+                            blurHash = A_BLUR_HASH,
                         )
                     )
                 )
@@ -454,6 +447,18 @@ fun anInReplyToDetails(
     textContent = textContent,
 )
 
+fun anImageInfo(): ImageInfo {
+    return ImageInfo(
+        height = 100,
+        width = 100,
+        mimetype = "image/jpeg",
+        size = 1000,
+        thumbnailInfo = null,
+        thumbnailSource = aMediaSource(),
+        blurhash = A_BLUR_HASH,
+    )
+}
+
 @Composable
 private fun testEnv(content: @Composable () -> Any?): Any? {
     var result: Any? = null