Ensure a Callback and only one is provided in the Plugin. Also reduce boilerplate code in Nodes.

libraries/troubleshoot/api/src/main/kotlin/io/element/android/libraries/troubleshoot/api/test/NotificationTroubleshootNavigator.kt

@@ -8,5 +8,5 @@
 package io.element.android.libraries.troubleshoot.api.test
 
 interface NotificationTroubleshootNavigator {
-    fun openIgnoredUsers()
+    fun navigateToBlockedUsers()
 }

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsNode.kt

@@ -12,11 +12,11 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.troubleshoot.api.NotificationTroubleShootEntryPoint
 import io.element.android.libraries.troubleshoot.api.test.NotificationTroubleshootNavigator
@@ -31,20 +31,13 @@ class TroubleshootNotificationsNode(
     factory: TroubleshootNotificationsPresenter.Factory,
 ) : Node(buildContext, plugins = plugins),
     NotificationTroubleshootNavigator {
+    private val callback: NotificationTroubleShootEntryPoint.Callback = callback()
     private val presenter = factory.create(
         navigator = this,
     )
 
-    private fun onDone() {
-        plugins<NotificationTroubleShootEntryPoint.Callback>().forEach {
-            it.onDone()
-        }
-    }
-
-    override fun openIgnoredUsers() {
-        plugins<NotificationTroubleShootEntryPoint.Callback>().forEach {
-            it.navigateToBlockedUsers()
-        }
+    override fun navigateToBlockedUsers() {
+        callback.navigateToBlockedUsers()
     }
 
     @Composable
@@ -53,7 +46,7 @@ class TroubleshootNotificationsNode(
         val state = presenter.present()
         TroubleshootNotificationsView(
             state = state,
-            onBackClick = ::onDone,
+            onBackClick = callback::onDone,
             modifier = modifier,
         )
     }

libraries/troubleshoot/impl/src/main/kotlin/io/element/android/libraries/troubleshoot/impl/history/PushHistoryNode.kt

@@ -12,11 +12,11 @@ import androidx.compose.ui.Modifier
 import com.bumble.appyx.core.modality.BuildContext
 import com.bumble.appyx.core.node.Node
 import com.bumble.appyx.core.plugin.Plugin
-import com.bumble.appyx.core.plugin.plugins
 import dev.zacsweers.metro.Assisted
 import dev.zacsweers.metro.AssistedInject
 import im.vector.app.features.analytics.plan.MobileScreen
 import io.element.android.annotations.ContributesNode
+import io.element.android.libraries.architecture.callback
 import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.RoomId
@@ -31,16 +31,10 @@ class PushHistoryNode(
     presenterFactory: PushHistoryPresenter.Factory,
     private val screenTracker: ScreenTracker,
 ) : Node(buildContext, plugins = plugins), PushHistoryNavigator {
-    private fun onDone() {
-        plugins<PushHistoryEntryPoint.Callback>().forEach {
-            it.onDone()
-        }
-    }
+    private val callback: PushHistoryEntryPoint.Callback = callback()
 
     override fun navigateTo(roomId: RoomId, eventId: EventId) {
-        plugins<PushHistoryEntryPoint.Callback>().forEach {
-            it.navigateToEvent(roomId, eventId)
-        }
+        callback.navigateToEvent(roomId, eventId)
     }
 
     private val presenter = presenterFactory.create(this)
@@ -51,7 +45,7 @@ class PushHistoryNode(
         val state = presenter.present()
         PushHistoryView(
             state = state,
-            onBackClick = ::onDone,
+            onBackClick = callback::onDone,
             modifier = modifier,
         )
     }

libraries/troubleshoot/impl/src/test/kotlin/io/element/android/libraries/troubleshoot/impl/TroubleshootNotificationsPresenterTest.kt

@@ -180,7 +180,7 @@ private fun createTroubleshootTestSuite(
 
 internal fun createTroubleshootNotificationsPresenter(
     navigator: NotificationTroubleshootNavigator = object : NotificationTroubleshootNavigator {
-        override fun openIgnoredUsers() = lambdaError()
+        override fun navigateToBlockedUsers() = lambdaError()
     },
     troubleshootTestSuite: TroubleshootTestSuite = createTroubleshootTestSuite(),
 ): TroubleshootNotificationsPresenter {

libraries/troubleshoot/test/src/main/kotlin/io/element/android/libraries/troubleshoot/test/FakeNotificationTroubleshootNavigator.kt

@@ -13,5 +13,5 @@ import io.element.android.tests.testutils.lambda.lambdaError
 class FakeNotificationTroubleshootNavigator(
     private val openIgnoredUsersResult: () -> Unit = { lambdaError() },
 ) : NotificationTroubleshootNavigator {
-    override fun openIgnoredUsers() = openIgnoredUsersResult()
+    override fun navigateToBlockedUsers() = openIgnoredUsersResult()
 }