Merge branch 'develop' into feature/fga/join_space

features/joinroom/impl/build.gradle.kts

@@ -1,4 +1,5 @@
 import extension.setupDependencyInjection
+import extension.testCommonDependencies
 
 /*
  * Copyright 2024 New Vector Ltd.
@@ -38,16 +39,8 @@ dependencies {
     implementation(projects.libraries.preferences.api)
     implementation(projects.appconfig)
 
-    testImplementation(libs.test.junit)
-    testImplementation(libs.coroutines.test)
-    testImplementation(libs.molecule.runtime)
-    testImplementation(libs.test.robolectric)
-    testImplementation(libs.test.truth)
-    testImplementation(libs.test.turbine)
+    testCommonDependencies(libs, true)
     testImplementation(projects.features.invite.test)
     testImplementation(projects.libraries.matrix.test)
-    testImplementation(projects.tests.testutils)
-    testImplementation(libs.androidx.compose.ui.test.junit)
     testImplementation(projects.libraries.preferences.test)
-    testReleaseImplementation(libs.androidx.compose.ui.test.manifest)
 }

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt

@@ -76,7 +76,7 @@ class JoinRoomPresenter(
     private val buildMeta: BuildMeta,
     private val seenInvitesStore: SeenInvitesStore,
 ) : Presenter<JoinRoomState> {
-    interface Factory {
+    fun interface Factory {
         fun create(
             roomId: RoomId,
             roomIdOrAlias: RoomIdOrAlias,

features/joinroom/impl/src/main/res/values-pt/translations.xml

@@ -20,7 +20,7 @@
   <string name="screen_join_room_knock_action">"Bater à porta"</string>
   <string name="screen_join_room_knock_message_characters_count">"%1$d de %2$d caracteres permitidos"</string>
   <string name="screen_join_room_knock_message_description">"Mensagem (opcional)"</string>
-  <string name="screen_join_room_knock_sent_description">"Irá receber um convite para participar na sala se seu pedido for aceite."</string>
+  <string name="screen_join_room_knock_sent_description">"Irás receber um convite para participar na sala se o pedido for aceite."</string>
   <string name="screen_join_room_knock_sent_title">"Pedido de adesão enviado"</string>
   <string name="screen_join_room_loading_alert_message">"Não conseguimos exibir a pré-visualização da sala. Isso pode ser devido a problemas de rede ou servidor."</string>
   <string name="screen_join_room_loading_alert_title">"Não foi possível exibir a pré-visualização desta sala"</string>

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPointTest.kt

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2025 New Vector Ltd.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
+ * Please see LICENSE files in the repository root for full details.
+ */
+
+package io.element.android.features.joinroom.impl
+
+import androidx.arch.core.executor.testing.InstantTaskExecutorRule
+import com.bumble.appyx.core.modality.BuildContext
+import com.bumble.appyx.core.node.Node
+import com.bumble.appyx.testing.junit4.util.MainDispatcherRule
+import com.google.common.truth.Truth.assertThat
+import im.vector.app.features.analytics.plan.JoinedRoom
+import io.element.android.features.invite.api.InviteData
+import io.element.android.features.invite.api.declineandblock.DeclineInviteAndBlockEntryPoint
+import io.element.android.features.joinroom.api.JoinRoomEntryPoint
+import io.element.android.libraries.matrix.api.core.toRoomIdOrAlias
+import io.element.android.libraries.matrix.test.A_ROOM_ID
+import io.element.android.tests.testutils.lambda.lambdaError
+import io.element.android.tests.testutils.node.TestParentNode
+import org.junit.Rule
+import org.junit.Test
+import java.util.Optional
+
+class DefaultJoinRoomEntryPointTest {
+    @get:Rule
+    val instantTaskExecutorRule = InstantTaskExecutorRule()
+
+    @get:Rule
+    val mainDispatcherRule = MainDispatcherRule()
+
+    @Test
+    fun `test node builder`() {
+        val entryPoint = DefaultJoinRoomEntryPoint()
+        val parentNode = TestParentNode.create { buildContext, plugins ->
+            JoinRoomFlowNode(
+                buildContext = buildContext,
+                plugins = plugins,
+                presenterFactory = { _, _, _, _, _ -> createJoinRoomPresenter() },
+                acceptDeclineInviteView = { _, _, _, _ -> lambdaError() },
+                declineAndBlockEntryPoint = object : DeclineInviteAndBlockEntryPoint {
+                    override fun createNode(parentNode: Node, buildContext: BuildContext, inviteData: InviteData) = lambdaError()
+                }
+            )
+        }
+        val inputs = JoinRoomEntryPoint.Inputs(
+            roomId = A_ROOM_ID,
+            roomIdOrAlias = A_ROOM_ID.toRoomIdOrAlias(),
+            roomDescription = Optional.ofNullable(null),
+            serverNames = emptyList(),
+            trigger = JoinedRoom.Trigger.RoomDirectory,
+        )
+        val result = entryPoint.createNode(parentNode, BuildContext.root(null), inputs)
+        assertThat(result).isInstanceOf(JoinRoomFlowNode::class.java)
+        assertThat(result.plugins).contains(inputs)
+    }
+}

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt

@@ -1034,39 +1034,6 @@ class JoinRoomPresenterTest {
         }
     }
 
-    private fun createJoinRoomPresenter(
-        roomId: RoomId = A_ROOM_ID,
-        roomDescription: Optional<RoomDescription> = Optional.empty(),
-        serverNames: List<String> = emptyList(),
-        trigger: JoinedRoom.Trigger = JoinedRoom.Trigger.Invite,
-        matrixClient: MatrixClient = FakeMatrixClient(),
-        joinRoomLambda: (RoomIdOrAlias, List<String>, JoinedRoom.Trigger) -> Result<Unit> = { _, _, _ ->
-            Result.success(Unit)
-        },
-        knockRoom: KnockRoom = FakeKnockRoom(),
-        cancelKnockRoom: CancelKnockRoom = FakeCancelKnockRoom(),
-        forgetRoom: ForgetRoom = FakeForgetRoom(),
-        buildMeta: BuildMeta = aBuildMeta(applicationName = "AppName"),
-        acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState> = Presenter { anAcceptDeclineInviteState() },
-        seenInvitesStore: SeenInvitesStore = InMemorySeenInvitesStore(),
-    ): JoinRoomPresenter {
-        return JoinRoomPresenter(
-            roomId = roomId,
-            roomIdOrAlias = roomId.toRoomIdOrAlias(),
-            roomDescription = roomDescription,
-            serverNames = serverNames,
-            trigger = trigger,
-            matrixClient = matrixClient,
-            joinRoom = FakeJoinRoom(joinRoomLambda),
-            knockRoom = knockRoom,
-            cancelKnockRoom = cancelKnockRoom,
-            forgetRoom = forgetRoom,
-            buildMeta = buildMeta,
-            acceptDeclineInvitePresenter = acceptDeclineInvitePresenter,
-            seenInvitesStore = seenInvitesStore,
-        )
-    }
-
     private fun aRoomDescription(
         roomId: RoomId = A_ROOM_ID,
         name: String? = A_ROOM_NAME,
@@ -1087,3 +1054,36 @@ class JoinRoomPresenterTest {
         )
     }
 }
+
+internal fun createJoinRoomPresenter(
+    roomId: RoomId = A_ROOM_ID,
+    roomDescription: Optional<RoomDescription> = Optional.empty(),
+    serverNames: List<String> = emptyList(),
+    trigger: JoinedRoom.Trigger = JoinedRoom.Trigger.Invite,
+    matrixClient: MatrixClient = FakeMatrixClient(),
+    joinRoomLambda: (RoomIdOrAlias, List<String>, JoinedRoom.Trigger) -> Result<Unit> = { _, _, _ ->
+        Result.success(Unit)
+    },
+    knockRoom: KnockRoom = FakeKnockRoom(),
+    cancelKnockRoom: CancelKnockRoom = FakeCancelKnockRoom(),
+    forgetRoom: ForgetRoom = FakeForgetRoom(),
+    buildMeta: BuildMeta = aBuildMeta(applicationName = "AppName"),
+    acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState> = Presenter { anAcceptDeclineInviteState() },
+    seenInvitesStore: SeenInvitesStore = InMemorySeenInvitesStore(),
+): JoinRoomPresenter {
+    return JoinRoomPresenter(
+        roomId = roomId,
+        roomIdOrAlias = roomId.toRoomIdOrAlias(),
+        roomDescription = roomDescription,
+        serverNames = serverNames,
+        trigger = trigger,
+        matrixClient = matrixClient,
+        joinRoom = FakeJoinRoom(joinRoomLambda),
+        knockRoom = knockRoom,
+        cancelKnockRoom = cancelKnockRoom,
+        forgetRoom = forgetRoom,
+        buildMeta = buildMeta,
+        acceptDeclineInvitePresenter = acceptDeclineInvitePresenter,
+        seenInvitesStore = seenInvitesStore,
+    )
+}