From 78dcc71d594a68eb87d967b613b43746c4094026 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Mon, 18 Dec 2023 13:38:46 +0200
Subject: [PATCH] Fix loading thumbnails with size

---
 .../core/extensions/ImageViewExtensions.kt    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/org/futo/circles/core/extensions/ImageViewExtensions.kt b/core/src/main/java/org/futo/circles/core/extensions/ImageViewExtensions.kt
index 681a6fe68..6c97f0982 100644
--- a/core/src/main/java/org/futo/circles/core/extensions/ImageViewExtensions.kt
+++ b/core/src/main/java/org/futo/circles/core/extensions/ImageViewExtensions.kt
@@ -83,13 +83,19 @@ fun ImageView.loadMatrixImage(
     session: Session? = null,
     applyBlur: Boolean = false
 ) {
-    val currentSession = session ?: MatrixSessionProvider.currentSession
-    val size = if (loadOriginalSize) null else preferredSize ?: Size(width, height)
-    val resolvedUrl = currentSession?.resolveUrl(url, size)
-    Glide.with(this)
-        .load(resolvedUrl)
-        .fitCenter()
-        .error(placeholder)
-        .apply { if (applyBlur) transform(BlurTransformation(30)) }
-        .into(this)
+    post {
+        val currentSession = session ?: MatrixSessionProvider.currentSession
+        val size = if (loadOriginalSize) null
+        else preferredSize ?: Size(
+            measuredWidth,
+            measuredHeight
+        ).takeIf { measuredWidth > 0 && measuredHeight > 0 }
+        val resolvedUrl = currentSession?.resolveUrl(url, size)
+        Glide.with(this)
+            .load(resolvedUrl)
+            .fitCenter()
+            .error(placeholder)
+            .apply { if (applyBlur) transform(BlurTransformation(30)) }
+            .into(this)
+    }
 }
\ No newline at end of file
-- 
GitLab