From 876f692f3f90b5656180371cd7e0b1059689b832 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Fri, 31 Oct 2025 15:02:26 +0100
Subject: [PATCH] Rename MessagesEntryPointNode to MessagesEntryPoint.NodeProxy
 for consistency. We already have a NodeProxy.

---
 .../android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt  | 3 +--
 .../android/features/messages/api/MessagesEntryPoint.kt     | 6 +++---
 .../android/features/messages/impl/MessagesFlowNode.kt      | 4 +---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
index 8216ee512c..2faed24a19 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt
@@ -26,7 +26,6 @@ import io.element.android.appnav.di.TimelineBindings
 import io.element.android.appnav.room.RoomNavigationTarget
 import io.element.android.features.forward.api.ForwardEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
-import io.element.android.features.messages.api.MessagesEntryPointNode
 import io.element.android.features.messages.api.pinned.PinnedEventsTimelineProvider
 import io.element.android.features.roomdetails.api.RoomDetailsEntryPoint
 import io.element.android.features.space.api.SpaceEntryPoint
@@ -283,7 +282,7 @@ class JoinedRoomLoadedFlowNode(
         val messageNode = waitForChildAttached<Node, NavTarget> { navTarget ->
             navTarget is NavTarget.Messages
         }
-        (messageNode as? MessagesEntryPointNode)?.attachThread(threadId, focusedEventId)
+        (messageNode as? MessagesEntryPoint.NodeProxy)?.attachThread(threadId, focusedEventId)
     }
 
     @Composable
diff --git a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
index 901a243945..99f9ed79a0 100644
--- a/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
+++ b/features/messages/api/src/main/kotlin/io/element/android/features/messages/api/MessagesEntryPoint.kt
@@ -47,8 +47,8 @@ interface MessagesEntryPoint : FeatureEntryPoint {
         params: Params,
         callback: Callback,
     ): Node
-}
 
-interface MessagesEntryPointNode {
-    suspend fun attachThread(threadId: ThreadId, focusedEventId: EventId?)
+    interface NodeProxy {
+        suspend fun attachThread(threadId: ThreadId, focusedEventId: EventId?)
+    }
 }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
index b4320ab69e..d51ebd250e 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesFlowNode.kt
@@ -32,7 +32,6 @@ import io.element.android.features.location.api.LocationService
 import io.element.android.features.location.api.SendLocationEntryPoint
 import io.element.android.features.location.api.ShowLocationEntryPoint
 import io.element.android.features.messages.api.MessagesEntryPoint
-import io.element.android.features.messages.api.MessagesEntryPointNode
 import io.element.android.features.messages.impl.attachments.Attachment
 import io.element.android.features.messages.impl.attachments.preview.AttachmentsPreviewNode
 import io.element.android.features.messages.impl.pinned.DefaultPinnedEventsTimelineProvider
@@ -130,8 +129,7 @@ class MessagesFlowNode(
     ),
     buildContext = buildContext,
     plugins = plugins,
-),
-    MessagesEntryPointNode {
+), MessagesEntryPoint.NodeProxy {
     sealed interface NavTarget : Parcelable {
         @Parcelize
         data class Messages(val focusedEventId: EventId?) : NavTarget