From 725e6c9855d7bba9200490e24db64d9233f9894a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 29 Oct 2025 09:04:58 +0100 Subject: [PATCH] Rename fun. --- .../android/appnav/room/joined/JoinedRoomLoadedFlowNode.kt | 2 +- .../element/android/features/forward/api/ForwardEntryPoint.kt | 2 +- .../android/features/forward/impl/ForwardMessagesNode.kt | 2 +- .../features/forward/impl/DefaultForwardEntryPointTest.kt | 2 +- .../element/android/features/messages/impl/MessagesFlowNode.kt | 2 +- 5 files changed, 5 insertions(+), 5 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 f7140804c8..f09113afa0 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 @@ -165,7 +165,7 @@ class JoinedRoomLoadedFlowNode( val timelineProvider = { MutableStateFlow(inputs.room.liveTimeline).asStateFlow() } val params = ForwardEntryPoint.Params(navTarget.eventId, timelineProvider) val callback = object : ForwardEntryPoint.Callback { - override fun onForwardDone(roomIds: List) { + override fun onDone(roomIds: List) { backstack.pop() roomIds.singleOrNull()?.let { roomId -> callbacks.forEach { it.onOpenRoom(roomId, emptyList()) } diff --git a/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt b/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt index e0632ca20c..d822c0adb8 100644 --- a/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt +++ b/features/forward/api/src/main/kotlin/io/element/android/features/forward/api/ForwardEntryPoint.kt @@ -24,7 +24,7 @@ interface ForwardEntryPoint : FeatureEntryPoint { } interface Callback : Plugin { - fun onForwardDone(roomIds: List) + fun onDone(roomIds: List) } data class Params( diff --git a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt index 3bab03ff65..27e95898d2 100644 --- a/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt +++ b/features/forward/impl/src/main/kotlin/io/element/android/features/forward/impl/ForwardMessagesNode.kt @@ -92,6 +92,6 @@ class ForwardMessagesNode( } private fun onForwardDone(roomIds: List) { - callbacks.forEach { it.onForwardDone(roomIds) } + callbacks.forEach { it.onDone(roomIds) } } } diff --git a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt index 9af564f50d..dabb8af4a1 100644 --- a/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt +++ b/features/forward/impl/src/test/kotlin/io/element/android/features/forward/impl/DefaultForwardEntryPointTest.kt @@ -46,7 +46,7 @@ class DefaultForwardEntryPointTest { ) } val callback = object : ForwardEntryPoint.Callback { - override fun onForwardDone(roomIds: List) = lambdaError() + override fun onDone(roomIds: List) = lambdaError() } val params = ForwardEntryPoint.Params( eventId = AN_EVENT_ID, 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 e9cec2b652..8807dd77cb 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 @@ -345,7 +345,7 @@ class MessagesFlowNode( } val params = ForwardEntryPoint.Params(navTarget.eventId, timelineProvider) val callback = object : ForwardEntryPoint.Callback { - override fun onForwardDone(roomIds: List) { + override fun onDone(roomIds: List) { backstack.pop() roomIds.singleOrNull()?.let { roomId -> callbacks.forEach { it.openRoom(roomId) }