Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try using custom fetcher for Coil...

Browse source
This commit is contained in:
ganfra 2022-11-21 20:15:11 +01:00
parent f9d389fe97
commit 1ba025ed30
10 changed files with 118 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

38
libraries/matrix/src/main/java/io/element/android/x/matrix/media/MediaFetcher.kt Normal file
View file

@ -0,0 +1,38 @@
package io.element.android.x.matrix.media
import coil.ImageLoader
import coil.fetch.FetchResult
import coil.fetch.Fetcher
import coil.request.Options
import io.element.android.x.matrix.Matrix
import java.nio.ByteBuffer
class MediaFetcher(
private val mediaResolver: MediaResolver,
private val meta: MediaResolver.Meta,
private val options: Options,
private val imageLoader: ImageLoader
) : Fetcher {
override suspend fun fetch(): FetchResult? {
val byteArray = mediaResolver.resolve(meta) ?: return null
val byteBuffer = ByteBuffer.wrap(byteArray)
return imageLoader.components.newFetcher(byteBuffer, options, imageLoader)?.first?.fetch()
}
class Factory(private val matrix: Matrix) : Fetcher.Factory<MediaResolver.Meta> {
override fun create(
data: MediaResolver.Meta,
options: Options,
imageLoader: ImageLoader
): Fetcher {
val activeClient = matrix.activeClient()
return MediaFetcher(
mediaResolver = activeClient.mediaResolver(),
meta = data,
options = options,
imageLoader = imageLoader
)
}
}
}

22
libraries/matrix/src/main/java/io/element/android/x/matrix/media/MediaResolver.kt
View file

@ -1,6 +1,7 @@
package io.element.android.x.matrix.media
import io.element.android.x.matrix.MatrixClient
import org.matrix.rustcomponents.sdk.MediaSource
import org.matrix.rustcomponents.sdk.mediaSourceFromUrl
interface MediaResolver {
@ -13,7 +14,14 @@ interface MediaResolver {
object Content : Kind
}
data class Meta(
val source: MediaSource,
val kind: Kind
)
suspend fun resolve(url: String?, kind: Kind): ByteArray?
suspend fun resolve(meta: Meta): ByteArray?
}
@ -22,12 +30,16 @@ internal class RustMediaResolver(private val client: MatrixClient) : MediaResolv
override suspend fun resolve(url: String?, kind: MediaResolver.Kind): ByteArray? {
if (url.isNullOrEmpty()) return null
val mediaSource = mediaSourceFromUrl(url)
return when (kind) {
is MediaResolver.Kind.Content -> client.loadMediaContentForSource(mediaSource)
return resolve(MediaResolver.Meta(mediaSource, kind))
}
override suspend fun resolve(meta: MediaResolver.Meta): ByteArray? {
return when (meta.kind) {
is MediaResolver.Kind.Content -> client.loadMediaContentForSource(meta.source)
is MediaResolver.Kind.Thumbnail -> client.loadMediaThumbnailForSource(
mediaSource,
kind.width.toLong(),
kind.height.toLong()
meta.source,
meta.kind.width.toLong(),
meta.kind.height.toLong()
)
}.getOrNull()
}