Merge remote-tracking branch 'origin/develop' into feature/fre/start_chat_search_matrixid

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/AvatarDataExt.kt

@@ -18,10 +18,8 @@ package io.element.android.libraries.matrix.ui.media
 
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.matrix.api.media.MediaResolver
-import org.matrix.rustcomponents.sdk.mediaSourceFromUrl
 import kotlin.math.roundToInt
 
 fun AvatarData.toMetadata(): MediaResolver.Meta {
-    val mediaSource = url?.let { mediaSourceFromUrl(it) }
-    return MediaResolver.Meta(source = mediaSource, kind = MediaResolver.Kind.Thumbnail(size.dp.value.roundToInt()))
+    return MediaResolver.Meta(url = url, kind = MediaResolver.Kind.Thumbnail(size.dp.value.roundToInt()))
 }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaFetcher.kt

@@ -33,7 +33,7 @@ internal class MediaFetcher(
 ) : Fetcher {
 
     override suspend fun fetch(): FetchResult? {
-        val byteArray = mediaResolver?.resolve(meta) ?: return null
+        val byteArray = mediaResolver?.resolve(meta.url, meta.kind) ?: return null
         val byteBuffer = ByteBuffer.wrap(byteArray)
         return imageLoader.components.newFetcher(byteBuffer, options, imageLoader)?.first?.fetch()
     }

libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/media/MediaKeyer.kt

@@ -33,4 +33,4 @@ internal class MediaKeyer : Keyer<MediaResolver.Meta> {
     }
 }
 
-private fun MediaResolver.Meta.toKey() = "${source?.url()}_${kind}"
+private fun MediaResolver.Meta.toKey() = "${url}_${kind}"