From 4e76e987178b1e4e2460a118834e18d0c2cc2841 Mon Sep 17 00:00:00 2001 From: Roger Yang Date: Tue, 27 Feb 2024 17:03:53 -0500 Subject: [PATCH] Bug 1882123 - Message middleware use store dispatch due to possibility of dispatching in IO thread --- .../fenix/messaging/state/MessagingMiddleware.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt b/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt index 5340996f4..46ac69595 100644 --- a/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt +++ b/app/src/main/java/org/mozilla/fenix/messaging/state/MessagingMiddleware.kt @@ -47,10 +47,10 @@ class MessagingMiddleware( context.state.messaging.messages, ) if (message != null) { - context.dispatch(UpdateMessageToShow(message)) + context.store.dispatch(UpdateMessageToShow(message)) onMessagedDisplayed(message, context) } else { - context.dispatch(ConsumeMessageToShow(action.surface)) + context.store.dispatch(ConsumeMessageToShow(action.surface)) } } @@ -86,7 +86,7 @@ class MessagingMiddleware( message: Message, ) { val newMessages = removeMessage(context, message) - context.dispatch(UpdateMessages(newMessages)) + context.store.dispatch(UpdateMessages(newMessages)) consumeMessageToShowIfNeeded(context, message) coroutineScope.launch { controller.onMessageDismissed(message) @@ -103,7 +103,7 @@ class MessagingMiddleware( } // Update app state. val newMessages = removeMessage(context, message) - context.dispatch(UpdateMessages(newMessages)) + context.store.dispatch(UpdateMessages(newMessages)) consumeMessageToShowIfNeeded(context, message) } @@ -113,7 +113,7 @@ class MessagingMiddleware( ) { val current = context.state.messaging.messageToShow[message.surface] if (current?.id == message.id) { - context.dispatch(ConsumeMessageToShow(message.surface)) + context.store.dispatch(ConsumeMessageToShow(message.surface)) } }