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

Merge pull request #6720 from element-hq/renovate/major-metro

Browse source 
Update metro to v1 (major)
This commit is contained in:
Benoit Marty 2026-05-12 15:56:18 +02:00 • committed by GitHub
commit eb564d6b8e
6 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libraries/matrixmedia/impl/src/main/kotlin/io/element/android/libraries/matrix/ui/media/ImageLoaderFactories.kt
View file

@ -16,7 +16,6 @@ import coil3.gif.GifDecoder
import coil3.network.okhttp.OkHttpNetworkFetcherFactory
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Provider
import io.element.android.libraries.di.annotations.ApplicationContext
import io.element.android.libraries.matrix.api.media.MatrixMediaLoader
import okhttp3.OkHttpClient
@ -29,7 +28,7 @@ interface ImageLoaderFactory {
@ContributesBinding(AppScope::class)
class DefaultImageLoaderFactory(
@ApplicationContext private val context: Context,
private val okHttpClient: Provider<OkHttpClient>,
private val okHttpClient: () -> OkHttpClient,
) : ImageLoaderFactory {
private val okHttpNetworkFetcherFactory = OkHttpNetworkFetcherFactory(
callFactory = {

5
libraries/network/src/main/kotlin/io/element/android/libraries/network/RetrofitFactory.kt
View file

@ -9,7 +9,6 @@
package io.element.android.libraries.network
import dev.zacsweers.metro.Inject
import dev.zacsweers.metro.Provider
import io.element.android.libraries.androidutils.json.JsonProvider
import io.element.android.libraries.core.uri.ensureTrailingSlash
import okhttp3.MediaType.Companion.toMediaType
@ -19,8 +18,8 @@ import retrofit2.converter.kotlinx.serialization.asConverterFactory
@Inject
class RetrofitFactory(
private val okHttpClient: Provider<OkHttpClient>,
private val json: Provider<JsonProvider>,
private val okHttpClient: () -> OkHttpClient,
private val json: () -> JsonProvider,
) {
fun create(baseUrl: String): Retrofit = Retrofit.Builder()
.baseUrl(baseUrl.ensureTrailingSlash())

3
libraries/voicerecorder/impl/src/main/kotlin/io/element/android/libraries/voicerecorder/impl/audio/DefaultEncoder.kt
View file

@ -9,7 +9,6 @@
package io.element.android.libraries.voicerecorder.impl.audio
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Provider
import io.element.android.libraries.di.RoomScope
import io.element.android.opusencoder.OggOpusEncoder
import timber.log.Timber
@ -20,7 +19,7 @@ import java.io.File
*/
@ContributesBinding(RoomScope::class)
class DefaultEncoder(
private val encoderProvider: Provider<OggOpusEncoder>,
private val encoderProvider: () -> OggOpusEncoder,
config: AudioConfig,
) : Encoder {
private val bitRate = config.bitRate