Skip to content

Commit a817b6f

Browse files
committed
Rename methods and update documentation.
1 parent 59e72fc commit a817b6f

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

enterprise

features/enterprise/api/src/main/kotlin/io/element/android/features/enterprise/api/ClientBuilderEnterpriseHook.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ interface ClientBuilderEnterpriseHook {
2121
* @param clientBuilder The [MatrixClientBuilder] to customize.
2222
* @return The customized [MatrixClientBuilder].
2323
*/
24-
suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder): MatrixClientBuilder
24+
suspend fun beforeClientCreation(clientBuilder: MatrixClientBuilder): MatrixClientBuilder
2525

2626
/**
2727
* Customize the [MatrixClientBuilder] for enterprise features.
28-
* This method is invoked when a new [MatrixClientBuilder] is created to build a client for a specific session.
28+
* This method is invoked as well as the other method when a new [MatrixClientBuilder] is created to build a client for a specific session.
2929
*
3030
* @param clientBuilder The [MatrixClientBuilder] to customize.
3131
* @param sessionId The [SessionId] for which the [MatrixClientBuilder] is being created.
3232
* @return The customized [MatrixClientBuilder].
3333
*/
34-
suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder
34+
suspend fun beforeClientCreationWithSession(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder
3535
}

features/enterprise/impl-foss/src/main/kotlin/io/element/android/features/enterprise/impl/DefaultClientBuilderEnterpriseHook.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ import io.element.android.libraries.matrix.api.core.SessionId
1818
*/
1919
@ContributesBinding(AppScope::class)
2020
class DefaultClientBuilderEnterpriseHook : ClientBuilderEnterpriseHook {
21-
override suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder): MatrixClientBuilder {
21+
override suspend fun beforeClientCreation(clientBuilder: MatrixClientBuilder): MatrixClientBuilder {
2222
// No modification
2323
return clientBuilder
2424
}
2525

26-
override suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder {
26+
override suspend fun beforeClientCreationWithSession(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder {
2727
// No modification
2828
return clientBuilder
2929
}

features/enterprise/test/src/main/kotlin/io/element/android/features/enterprise/test/FakeClientBuilderEnterpriseHook.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import io.element.android.libraries.matrix.api.MatrixClientBuilder
1212
import io.element.android.libraries.matrix.api.core.SessionId
1313

1414
class FakeClientBuilderEnterpriseHook(
15-
private val tweakClientBuilderResult: (MatrixClientBuilder) -> MatrixClientBuilder = { it },
16-
private val tweakClientBuilderWithSessionIdResult: (MatrixClientBuilder, SessionId) -> MatrixClientBuilder = { clientBuilder, _ -> clientBuilder },
15+
private val beforeClientCreationResult: (MatrixClientBuilder) -> MatrixClientBuilder = { it },
16+
private val beforeClientCreationWithSessionResult: (MatrixClientBuilder, SessionId) -> MatrixClientBuilder = { clientBuilder, _ -> clientBuilder },
1717
) : ClientBuilderEnterpriseHook {
18-
override suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder): MatrixClientBuilder {
19-
return tweakClientBuilderResult(clientBuilder)
18+
override suspend fun beforeClientCreation(clientBuilder: MatrixClientBuilder): MatrixClientBuilder {
19+
return beforeClientCreationResult(clientBuilder)
2020
}
2121

22-
override suspend fun tweakClientBuilder(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder {
23-
return tweakClientBuilderWithSessionIdResult(clientBuilder, sessionId)
22+
override suspend fun beforeClientCreationWithSession(clientBuilder: MatrixClientBuilder, sessionId: SessionId): MatrixClientBuilder {
23+
return beforeClientCreationWithSessionResult(clientBuilder, sessionId)
2424
}
2525
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class RustMatrixClientFactory(
100100
.homeserverUrl(sessionData.homeserverUrl)
101101
.enableAutomaticBackPagination(featureFlagService.isFeatureEnabled(FeatureFlags.AutomaticBackPagination))
102102
.let {
103-
(clientBuilderEnterpriseHook.tweakClientBuilder(RustMatrixClientBuilder(it), SessionId(sessionData.userId)) as RustMatrixClientBuilder).inner
103+
(clientBuilderEnterpriseHook.beforeClientCreationWithSession(RustMatrixClientBuilder(it), SessionId(sessionData.userId)) as RustMatrixClientBuilder).inner
104104
}
105105
.use { it.build() }
106106

@@ -222,7 +222,7 @@ class RustMatrixClientFactory(
222222
proxyProvider.provides()?.let { proxy(it) } ?: this
223223
}
224224
.let {
225-
(clientBuilderEnterpriseHook.tweakClientBuilder(RustMatrixClientBuilder(it)) as RustMatrixClientBuilder).inner
225+
(clientBuilderEnterpriseHook.beforeClientCreation(RustMatrixClientBuilder(it)) as RustMatrixClientBuilder).inner
226226
}
227227
}
228228
}

0 commit comments

Comments
 (0)