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

Remove context(parentNode: Node) and provide the parent Node as a parameter.

Browse source
This commit is contained in:
Benoit Marty 2025-10-31 12:04:57 +01:00
parent 45400d70d2
commit e70d767183
161 changed files with 668 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

8
features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/IncomingVerificationEntryPoint.kt
View file

@ -19,8 +19,12 @@ interface IncomingVerificationEntryPoint : FeatureEntryPoint {
val verificationRequest: VerificationRequest.Incoming,
) : NodeInputs
context(parentNode: Node)
fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: Params,
callback: Callback,
): Node
interface Callback : Plugin {
fun onDone()

8
features/verifysession/api/src/main/kotlin/io/element/android/features/verifysession/api/OutgoingVerificationEntryPoint.kt
View file

@ -20,8 +20,12 @@ interface OutgoingVerificationEntryPoint : FeatureEntryPoint {
val verificationRequest: VerificationRequest.Outgoing,
) : NodeInputs
context(parentNode: Node)
fun createNode(buildContext: BuildContext, params: Params, callback: Callback): Node
fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: Params,
callback: Callback,
): Node
interface Callback : Plugin {
fun navigateToLearnMoreAboutEncryption()

2
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPoint.kt
View file

@ -16,8 +16,8 @@ import io.element.android.libraries.architecture.createNode
@ContributesBinding(AppScope::class)
class DefaultIncomingVerificationEntryPoint : IncomingVerificationEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: IncomingVerificationEntryPoint.Params,
callback: IncomingVerificationEntryPoint.Callback,

2
features/verifysession/impl/src/main/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPoint.kt
View file

@ -16,8 +16,8 @@ import io.element.android.libraries.architecture.createNode
@ContributesBinding(AppScope::class)
class DefaultOutgoingVerificationEntryPoint : OutgoingVerificationEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: OutgoingVerificationEntryPoint.Params,
callback: OutgoingVerificationEntryPoint.Callback,

13
features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/incoming/DefaultIncomingVerificationEntryPointTest.kt
View file

@ -37,13 +37,12 @@ class DefaultIncomingVerificationEntryPointTest {
val params = IncomingVerificationEntryPoint.Params(
verificationRequest = anIncomingSessionVerificationRequest()
)
val result = with(parentNode) {
entryPoint.createNode(
buildContext = BuildContext.root(null),
params = params,
callback = callback,
)
}
val result = entryPoint.createNode(
parentNode = parentNode,
buildContext = BuildContext.root(null),
params = params,
callback = callback,
)
assertThat(result).isInstanceOf(IncomingVerificationNode::class.java)
assertThat(result.plugins).contains(params)
assertThat(result.plugins).contains(callback)

13
features/verifysession/impl/src/test/kotlin/io/element/android/features/verifysession/impl/outgoing/DefaultOutgoingVerificationEntryPointTest.kt
View file

@ -42,13 +42,12 @@ class DefaultOutgoingVerificationEntryPointTest {
showDeviceVerifiedScreen = true,
verificationRequest = anOutgoingSessionVerificationRequest(),
)
val result = with(parentNode) {
entryPoint.createNode(
buildContext = BuildContext.root(null),
params = params,
callback = callback,
)
}
val result = entryPoint.createNode(
parentNode = parentNode,
buildContext = BuildContext.root(null),
params = params,
callback = callback,
)
assertThat(result).isInstanceOf(OutgoingVerificationNode::class.java)
assertThat(result.plugins).contains(params)
assertThat(result.plugins).contains(callback)

2
features/verifysession/test/src/main/kotlin/io/element/android/features/verifysession/test/FakeIncomingVerificationEntryPoint.kt
View file

@ -13,8 +13,8 @@ import io.element.android.features.verifysession.api.IncomingVerificationEntryPo
import io.element.android.tests.testutils.lambda.lambdaError
class FakeIncomingVerificationEntryPoint : IncomingVerificationEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: IncomingVerificationEntryPoint.Params,
callback: IncomingVerificationEntryPoint.Callback,

2
features/verifysession/test/src/main/kotlin/io/element/android/features/verifysession/test/FakeOutgoingVerificationEntryPoint.kt
View file

@ -13,8 +13,8 @@ import io.element.android.features.verifysession.api.OutgoingVerificationEntryPo
import io.element.android.tests.testutils.lambda.lambdaError
class FakeOutgoingVerificationEntryPoint : OutgoingVerificationEntryPoint {
context(parentNode: Node)
override fun createNode(
parentNode: Node,
buildContext: BuildContext,
params: OutgoingVerificationEntryPoint.Params,
callback: OutgoingVerificationEntryPoint.Callback,