|
|
|
@ -10,12 +10,12 @@ import kotlinx.coroutines.Dispatchers
|
|
|
|
|
import kotlinx.coroutines.launch
|
|
|
|
|
import mozilla.components.lib.state.Middleware
|
|
|
|
|
import mozilla.components.lib.state.MiddlewareContext
|
|
|
|
|
import org.mozilla.fenix.GleanMetrics.Messaging
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.ConsumeMessageToShow
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.Evaluate
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.MessageClicked
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.MessageDismissed
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.MessageDisplayed
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.Restore
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.UpdateMessageToShow
|
|
|
|
|
import org.mozilla.fenix.components.appstate.AppAction.MessagingAction.UpdateMessages
|
|
|
|
@ -47,6 +47,7 @@ class MessagingMiddleware(
|
|
|
|
|
val message = messagingStorage.getNextMessage(context.state.messaging.messages)
|
|
|
|
|
if (message != null) {
|
|
|
|
|
context.dispatch(UpdateMessageToShow(message))
|
|
|
|
|
onMessagedDisplayed(message, context)
|
|
|
|
|
} else {
|
|
|
|
|
context.dispatch(ConsumeMessageToShow)
|
|
|
|
|
}
|
|
|
|
@ -56,8 +57,6 @@ class MessagingMiddleware(
|
|
|
|
|
|
|
|
|
|
is MessageDismissed -> onMessageDismissed(context, action.message)
|
|
|
|
|
|
|
|
|
|
is MessageDisplayed -> onMessagedDisplayed(action.message, context)
|
|
|
|
|
|
|
|
|
|
else -> {
|
|
|
|
|
// no-op
|
|
|
|
|
}
|
|
|
|
@ -70,6 +69,7 @@ class MessagingMiddleware(
|
|
|
|
|
oldMessage: Message,
|
|
|
|
|
context: AppStoreMiddlewareContext
|
|
|
|
|
) {
|
|
|
|
|
sendShownMessageTelemetry(oldMessage.id)
|
|
|
|
|
val newMetadata = oldMessage.metadata.copy(
|
|
|
|
|
displayCount = oldMessage.metadata.displayCount + 1,
|
|
|
|
|
lastTimeShown = now()
|
|
|
|
@ -80,6 +80,7 @@ class MessagingMiddleware(
|
|
|
|
|
val newMessages = if (newMetadata.displayCount < oldMessage.maxDisplayCount) {
|
|
|
|
|
updateMessage(context, oldMessage, newMessage)
|
|
|
|
|
} else {
|
|
|
|
|
sendExpiredMessageTelemetry(newMessage.id)
|
|
|
|
|
consumeMessageToShowIfNeeded(context, oldMessage)
|
|
|
|
|
removeMessage(context, oldMessage)
|
|
|
|
|
}
|
|
|
|
@ -89,6 +90,16 @@ class MessagingMiddleware(
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@VisibleForTesting
|
|
|
|
|
internal fun sendShownMessageTelemetry(messageId: String) {
|
|
|
|
|
Messaging.messageShown.record(Messaging.MessageShownExtra(messageId))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@VisibleForTesting
|
|
|
|
|
internal fun sendExpiredMessageTelemetry(messageId: String) {
|
|
|
|
|
Messaging.messageExpired.record(Messaging.MessageExpiredExtra(messageId))
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@VisibleForTesting
|
|
|
|
|
internal fun onMessageDismissed(
|
|
|
|
|
context: AppStoreMiddlewareContext,
|
|
|
|
|