Fixes after rebase

libraries/matrix/api/build.gradle.kts

@@ -1,5 +1,6 @@
 import config.BuildTimeConfig
 import extension.buildConfigFieldStr
+import extension.setupDependencyInjection
 
 /*
  * Copyright 2022-2024 New Vector Ltd.
@@ -14,6 +15,8 @@ plugins {
     alias(libs.plugins.kotlin.serialization)
 }
 
+setupDependencyInjection()
+
 android {
     namespace = "io.element.android.libraries.matrix.api"
 

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/mxc/MxcTools.kt

@@ -10,7 +10,7 @@ package io.element.android.libraries.matrix.api.mxc
 import dev.zacsweers.metro.Inject
 
 @Inject
-class MxcTools() {
+class MxcTools {
     /**
      * Regex to match a Matrix Content (mxc://) URI.
      *

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/ClientBuilderProvider.kt

@@ -18,7 +18,7 @@ interface ClientBuilderProvider {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustClientBuilderProvider() : ClientBuilderProvider {
+class RustClientBuilderProvider : ClientBuilderProvider {
     override fun provide(): ClientBuilder {
         return ClientBuilder()
     }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustSdkMetadata.kt

@@ -15,7 +15,7 @@ import org.matrix.rustcomponents.sdk.sdkGitSha
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustSdkMetadata() : SdkMetadata {
+class RustSdkMetadata : SdkMetadata {
     override val sdkGitSha: String
         get() = sdkGitSha()
 }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/auth/qrlogin/RustQrCodeLoginDataFactory.kt

@@ -17,7 +17,7 @@ import org.matrix.rustcomponents.sdk.QrCodeData
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustQrCodeLoginDataFactory() : MatrixQrCodeLoginDataFactory {
+class RustQrCodeLoginDataFactory : MatrixQrCodeLoginDataFactory {
     override fun parseQrCodeData(data: ByteArray): Result<MatrixQrCodeLoginData> {
         return runCatchingExceptions { SdkQrCodeLoginData(QrCodeData.fromBytes(data)) }
     }

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/certificates/DefaultUserCertificatesProvider.kt

@@ -16,7 +16,7 @@ import java.security.KeyStoreException
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultUserCertificatesProvider() : UserCertificatesProvider {
+class DefaultUserCertificatesProvider : UserCertificatesProvider {
     /**
      * Get additional user-installed certificates from the `AndroidCAStore` `Keystore`.
      *

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/keys/DefaultPassphraseGenerator.kt

@@ -17,7 +17,7 @@ private const val SECRET_SIZE = 256
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultPassphraseGenerator() : PassphraseGenerator {
+class DefaultPassphraseGenerator : PassphraseGenerator {
     override fun generatePassphrase(): String? {
         val key = ByteArray(size = SECRET_SIZE)
         SecureRandom().nextBytes(key)

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultMatrixToConverter.kt

@@ -21,7 +21,7 @@ import io.element.android.libraries.matrix.api.permalink.MatrixToConverter
  */
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultMatrixToConverter() : MatrixToConverter {
+class DefaultMatrixToConverter : MatrixToConverter {
     /**
      * Try to convert a URL from an element web instance or from a client permalink to a matrix.to url.
      * To be successfully converted, URL path should contain one of the [SUPPORTED_PATHS].

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/permalink/DefaultPermalinkBuilder.kt

@@ -21,7 +21,7 @@ import org.matrix.rustcomponents.sdk.matrixToUserPermalink
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultPermalinkBuilder() : PermalinkBuilder {
+class DefaultPermalinkBuilder : PermalinkBuilder {
     override fun permalinkForUser(userId: UserId): Result<String> {
         if (!MatrixPatterns.isUserId(userId.value)) {
             return Result.failure(PermalinkBuilderError.InvalidData)

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/platform/RustInitPlatformService.kt

@@ -17,7 +17,7 @@ import org.matrix.rustcomponents.sdk.initPlatform
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustInitPlatformService() : InitPlatformService {
+class RustInitPlatformService : InitPlatformService {
     override fun init(tracingConfiguration: TracingConfiguration) {
         initPlatform(
             config = tracingConfiguration.map(),

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventTypeFilterFactory.kt

@@ -20,7 +20,7 @@ interface TimelineEventTypeFilterFactory {
 
 @ContributesBinding(AppScope::class)
 @Inject
-class RustTimelineEventTypeFilterFactory() : TimelineEventTypeFilterFactory {
+class RustTimelineEventTypeFilterFactory : TimelineEventTypeFilterFactory {
     override fun create(listStateEventType: List<StateEventType>): TimelineEventTypeFilter {
         return TimelineEventTypeFilter.exclude(
             listStateEventType.map { stateEventType ->

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/alias/DefaultRoomAliasHelper.kt

@@ -15,7 +15,7 @@ import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
 
 @ContributesBinding(AppScope::class)
 @Inject
-class DefaultRoomAliasHelper() : RoomAliasHelper {
+class DefaultRoomAliasHelper : RoomAliasHelper {
     override fun roomAliasNameFromRoomDisplayName(name: String): String {
         return org.matrix.rustcomponents.sdk.roomAliasNameFromRoomDisplayName(name)
     }