letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 6 Packages Projects Releases Wiki Activity

Update metro to v0.11.0 (#6245)

Browse Source 
* Update metro to v0.11.0

* Fix `@AssistedInject` usages

Now the injected variables in the factories must match the names in the constructors

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jorge Martín <jorgem@element.io>
This commit is contained in:
renovate[bot]
2026-02-25 16:19:47 +01:00
committed by GitHub
parent fe4554703c
commit 89a6f5a7bf
11 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
View File

@@ -76,7 +76,7 @@ class ConfigureRoomPresenter(
) : Presenter<ConfigureRoomState> {
@AssistedFactory
interface Factory {
fun create(isSpace: Boolean, parentSpaceId: RoomId?): ConfigureRoomPresenter
fun create(isSpace: Boolean, initialParentSpaceId: RoomId?): ConfigureRoomPresenter
}
private val cameraPermissionPresenter: PermissionsPresenter = permissionsPresenterFactory.create(android.Manifest.permission.CAMERA)

2
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollNode.kt
View File

@@ -41,7 +41,7 @@ class CreatePollNode(
private var isNavigatingUp = AtomicBoolean(false)
private val presenter = presenterFactory.create(
backNavigator = {
navigateUp = {
if (isNavigatingUp.compareAndSet(false, true)) {
navigateUp()
}

2
features/poll/impl/src/main/kotlin/io/element/android/features/poll/impl/create/CreatePollPresenter.kt
View File

@@ -50,7 +50,7 @@ class CreatePollPresenter(
fun interface Factory {
fun create(
timelineMode: Timeline.Mode,
backNavigator: () -> Unit,
navigateUp: () -> Unit,
mode: CreatePollMode
): CreatePollPresenter
}

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt
View File

@@ -47,7 +47,7 @@ class EditDefaultNotificationSettingPresenter(
) : Presenter<EditDefaultNotificationSettingState> {
@AssistedFactory
interface Factory {
fun create(oneToOne: Boolean): EditDefaultNotificationSettingPresenter
fun create(isOneToOne: Boolean): EditDefaultNotificationSettingPresenter
}
private val collator = Collator.getInstance().apply {

8
features/viewfolder/impl/src/main/kotlin/io/element/android/features/viewfolder/impl/file/ViewFilePresenter.kt
View File

@@ -25,8 +25,8 @@ import kotlinx.coroutines.launch
@AssistedInject
class ViewFilePresenter(
@Assisted("path") val path: String,
@Assisted("name") val name: String,
@Assisted val path: String,
@Assisted val name: String,
private val fileContentReader: FileContentReader,
private val fileShare: FileShare,
private val fileSave: FileSave,
@@ -34,8 +34,8 @@ class ViewFilePresenter(
@AssistedFactory
interface Factory {
fun create(
@Assisted("path") path: String,
@Assisted("name") name: String,
path: String,
name: String,
): ViewFilePresenter
}

2
gradle/libs.versions.toml
View File

@@ -54,7 +54,7 @@ haze = "1.7.2"
dependencyAnalysis = "3.5.1"
# DI
metro = "0.10.4"
metro = "0.11.0"
# Auto service
autoservice = "1.1.1"

4
libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/workmanager/VacuumDatabaseWorker.kt
View File

@@ -27,11 +27,11 @@ import timber.log.Timber
@AssistedInject
class VacuumDatabaseWorker(
@Assisted workerParams: WorkerParameters,
@Assisted params: WorkerParameters,
@ApplicationContext private val context: Context,
private val matrixClientProvider: MatrixClientProvider,
private val analyticsService: AnalyticsService,
) : CoroutineWorker(context, workerParams) {
) : CoroutineWorker(context, params) {
companion object {
const val SESSION_ID_PARAM = "session_id"
}

10
libraries/mediaviewer/impl/src/main/kotlin/io/element/android/libraries/mediaviewer/impl/gallery/voice/VoiceMessagePresenter.kt
View File

@@ -37,7 +37,7 @@ interface VoiceMessagePresenterModule {
@AssistedInject
class VoiceMessagePresenter(
voiceMessagePresenterFactory: VoiceMessagePresenterFactory,
@Assisted private val item: MediaItem.Voice,
@Assisted private val content: MediaItem.Voice,
) : Presenter<VoiceMessageState> {
@AssistedFactory
fun interface Factory : MediaItemPresenterFactory<MediaItem.Voice, VoiceMessageState> {
@@ -45,10 +45,10 @@ class VoiceMessagePresenter(
}
private val presenter = voiceMessagePresenterFactory.createVoiceMessagePresenter(
eventId = item.eventId,
mediaSource = item.mediaSource,
mimeType = item.mediaInfo.mimeType,
filename = item.mediaInfo.filename,
eventId = content.eventId,
mediaSource = content.mediaSource,
mimeType = content.mediaInfo.mimeType,
filename = content.mediaInfo.filename,
// TODO Get the duration for the fallback?
duration = Duration.ZERO,
)

4
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/workmanager/FetchNotificationsWorker.kt
View File

@@ -44,7 +44,7 @@ import kotlin.time.Duration.Companion.seconds
@AssistedInject
class FetchNotificationsWorker(
@Assisted workerParams: WorkerParameters,
@Assisted params: WorkerParameters,
@ApplicationContext private val context: Context,
private val networkMonitor: NetworkMonitor,
private val eventResolver: NotifiableEventResolver,
@@ -54,7 +54,7 @@ class FetchNotificationsWorker(
private val workerDataConverter: SyncNotificationsWorkerDataConverter,
private val buildVersionSdkIntProvider: BuildVersionSdkIntProvider,
private val analyticsService: AnalyticsService,
) : CoroutineWorker(context, workerParams) {
) : CoroutineWorker(context, params) {
override suspend fun doWork(): Result {
Timber.d("FetchNotificationsWorker started")
val requests = workerDataConverter.deserialize(inputData) ?: return Result.failure()

2
libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/workmanager/FetchNotificationWorkerTest.kt
View File

@@ -170,7 +170,7 @@ class FetchNotificationWorkerTest {
syncOnNotifiableEvent: SyncOnNotifiableEvent = SyncOnNotifiableEvent {},
analyticsService: FakeAnalyticsService = FakeAnalyticsService(),
) = FetchNotificationsWorker(
workerParams = createWorkerParams(workDataOf("requests" to input)),
params = createWorkerParams(workDataOf("requests" to input)),
context = InstrumentationRegistry.getInstrumentation().context,
networkMonitor = networkMonitor,
eventResolver = eventResolver,

8
libraries/voiceplayer/impl/src/main/kotlin/io/element/android/libraries/voiceplayer/impl/VoiceMessageMediaRepo.kt
View File

@@ -63,16 +63,16 @@ class DefaultVoiceMessageMediaRepo(
mxcTools: MxcTools,
private val matrixMediaLoader: MatrixMediaLoader,
@Assisted private val mediaSource: MediaSource,
@Assisted("mimeType") private val mimeType: String?,
@Assisted("filename") private val filename: String?,
@Assisted private val mimeType: String?,
@Assisted private val filename: String?,
) : VoiceMessageMediaRepo {
@ContributesBinding(RoomScope::class)
@AssistedFactory
fun interface Factory : VoiceMessageMediaRepo.Factory {
override fun create(
mediaSource: MediaSource,
@Assisted("mimeType") mimeType: String?,
@Assisted("filename") filename: String?,
@Assisted mimeType: String?,
@Assisted filename: String?,
): DefaultVoiceMessageMediaRepo
}