From a817b6f219a1b9a3b8acd20065a858e4616a7ed4 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 8 Sep 2026 17:06:53 +0200 Subject: [PATCH] Rename methods and update documentation. --- enterprise | 2 +- .../enterprise/api/ClientBuilderEnterpriseHook.kt | 6 +++--- .../impl/DefaultClientBuilderEnterpriseHook.kt | 4 ++-- .../test/FakeClientBuilderEnterpriseHook.kt | 12 ++++++------ .../libraries/matrix/impl/RustMatrixClientFactory.kt | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/enterprise b/enterprise index 10b18f1416..ebe8b6a108 160000 --- a/enterprise +++ b/enterprise @@ -1 +1 @@ -Subproject commit 10b18f141697b8a3998022b1cb7ff9f4a9f1171c +Subproject commit ebe8b6a108dcc823b7d123b94f00c11ed2d62d88 diff --git a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/ClientBuilderEnterpriseHook.kt b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/ClientBuilderEnterpriseHook.kt index f60b647c5d..883cab6840 100644 --- a/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/ClientBuilderEnterpriseHook.kt +++ b/features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/ClientBuilderEnterpriseHook.kt @@ -21,15 +21,15 @@ interface ClientBuilderEnterpriseHook { * @param clientBuilder The [MatrixClientBuilder] to customize. * @return The customized [MatrixClientBuilder]. */ - suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder): MatrixClientBuilder + suspend fun beforeClientCreation(clientBuilder: MatrixClientBuilder): MatrixClientBuilder /** * Customize the [MatrixClientBuilder] for enterprise features. - * This method is invoked when a new [MatrixClientBuilder] is created to build a client for a specific session. + * This method is invoked as well as the other method when a new [MatrixClientBuilder] is created to build a client for a specific session. * * @param clientBuilder The [MatrixClientBuilder] to customize. * @param sessionId The [SessionId] for which the [MatrixClientBuilder] is being created. * @return The customized [MatrixClientBuilder]. */ - suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder + suspend fun beforeClientCreationWithSession(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder } diff --git a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultClientBuilderEnterpriseHook.kt b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultClientBuilderEnterpriseHook.kt index e4b6df4171..44887a0736 100644 --- a/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultClientBuilderEnterpriseHook.kt +++ b/features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultClientBuilderEnterpriseHook.kt @@ -18,12 +18,12 @@ import io.element.android.libraries.matrix.api.core.SessionId */ @ContributesBinding(AppScope::class) class DefaultClientBuilderEnterpriseHook : ClientBuilderEnterpriseHook { - override suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder): MatrixClientBuilder { + override suspend fun beforeClientCreation(clientBuilder: MatrixClientBuilder): MatrixClientBuilder { // No modification return clientBuilder } - override suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder { + override suspend fun beforeClientCreationWithSession(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder { // No modification return clientBuilder } diff --git a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeClientBuilderEnterpriseHook.kt b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeClientBuilderEnterpriseHook.kt index 8a8c3c5a67..3781f25382 100644 --- a/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeClientBuilderEnterpriseHook.kt +++ b/features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeClientBuilderEnterpriseHook.kt @@ -12,14 +12,14 @@ import io.element.android.libraries.matrix.api.MatrixClientBuilder import io.element.android.libraries.matrix.api.core.SessionId class FakeClientBuilderEnterpriseHook( - private val tweakClientBuilderResult: (MatrixClientBuilder) -> MatrixClientBuilder = { it }, - private val tweakClientBuilderWithSessionIdResult: (MatrixClientBuilder, SessionId) -> MatrixClientBuilder = { clientBuilder, _ -> clientBuilder }, + private val beforeClientCreationResult: (MatrixClientBuilder) -> MatrixClientBuilder = { it }, + private val beforeClientCreationWithSessionResult: (MatrixClientBuilder, SessionId) -> MatrixClientBuilder = { clientBuilder, _ -> clientBuilder }, ) : ClientBuilderEnterpriseHook { - override suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder): MatrixClientBuilder { - return tweakClientBuilderResult(clientBuilder) + override suspend fun beforeClientCreation(clientBuilder: MatrixClientBuilder): MatrixClientBuilder { + return beforeClientCreationResult(clientBuilder) } - override suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder { - return tweakClientBuilderWithSessionIdResult(clientBuilder, sessionId) + override suspend fun beforeClientCreationWithSession(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder { + return beforeClientCreationWithSessionResult(clientBuilder, sessionId) } } diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt index 8f07b3c546..16f33d91db 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClientFactory.kt @@ -100,7 +100,7 @@ class RustMatrixClientFactory( .homeserverUrl(sessionData.homeserverUrl) .enableAutomaticBackPagination(featureFlagService.isFeatureEnabled(FeatureFlags.AutomaticBackPagination)) .let { - (clientBuilderEnterpriseHook.tweakClientBuilder(RustMatrixClientBuilder(it), SessionId(sessionData.userId)) as RustMatrixClientBuilder).inner + (clientBuilderEnterpriseHook.beforeClientCreationWithSession(RustMatrixClientBuilder(it), SessionId(sessionData.userId)) as RustMatrixClientBuilder).inner } .use { it.build() } @@ -222,7 +222,7 @@ class RustMatrixClientFactory( proxyProvider.provides()?.let { proxy(it) } ?: this } .let { - (clientBuilderEnterpriseHook.tweakClientBuilder(RustMatrixClientBuilder(it)) as RustMatrixClientBuilder).inner + (clientBuilderEnterpriseHook.beforeClientCreation(RustMatrixClientBuilder(it)) as RustMatrixClientBuilder).inner } } }