Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import mozilla.components.ui.richtext.ir.RichDocument
/**
* Actions for the [SummarizationStore].
*/
interface SummarizationAction : Action
sealed interface SummarizationAction : Action

/** The Summarization Screen View Appeared */
data object ViewAppeared : SummarizationAction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,29 @@ class SummarizationMiddleware(
is SummarizationFailed -> scope.launch {
errorReporter.report(TAG, action.exception)
}

is ContentExtracted,
DownloadConsentAction.AllowClicked,
DownloadConsentAction.CancelClicked,
DownloadConsentAction.LearnMoreClicked,
DownloadErrorAction.CancelClicked,
DownloadErrorAction.LearnMoreClicked,
DownloadErrorAction.TryAgainClicked,
DownloadInProgressAction.CancelClicked,
ErrorAction.ErrorDismissed,
ErrorAction.LearnMoreClicked,
OffDeviceSummarizationShakeConsentAction.LearnMoreClicked,
OnDeviceSummarizationShakeConsentAction.AllowClicked,
OnDeviceSummarizationShakeConsentAction.CancelClicked,
OnDeviceSummarizationShakeConsentAction.LearnMoreClicked,
is ReceivedParsedDocument,
SettingsBackClicked,
SettingsClicked,
ShakeConsentRequested,
SummarizationCompleted,
is SummarizationRequested,
is ViewDismissed,
-> Unit
}

next(action)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,24 @@ fun summarizationReducer(state: SummarizationState, action: SummarizationAction)
is SummarizationState.Settings -> SummarizationState.Summarized(info = state.info, document = state.document)
else -> state
}
else -> state

is ContentExtracted,
DownloadConsentAction.AllowClicked,
DownloadConsentAction.CancelClicked,
DownloadConsentAction.LearnMoreClicked,
DownloadErrorAction.CancelClicked,
DownloadErrorAction.LearnMoreClicked,
DownloadErrorAction.TryAgainClicked,
DownloadInProgressAction.CancelClicked,
ErrorAction.LearnMoreClicked,
LlmProviderAction.ProviderAvailable,
is LlmProviderAction.ProviderInitialized,
OffDeviceSummarizationShakeConsentAction.AllowClicked,
OnDeviceSummarizationShakeConsentAction.AllowClicked,
OnDeviceSummarizationShakeConsentAction.CancelClicked,
ViewAppeared,
is ViewDismissed,
-> state
}

private fun SummarizationState.complete(): SummarizationState {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,11 @@ private fun SummarizationScreenContent(
}
}

else -> Unit
SummarizationState.DownloadConsentRequired,
is SummarizationState.Downloading,
SummarizationState.Finished.Cancelled,
SummarizationState.Finished.ErrorDismissed,
-> Unit
}
}

Expand All @@ -239,7 +243,18 @@ private fun ApplyHaptics(state: SummarizationState) {
is SummarizationState.Error -> {
haptic.performHapticFeedback(HapticFeedbackType.Reject)
}
else -> {}

SummarizationState.DownloadConsentRequired,
is SummarizationState.Downloading,
SummarizationState.Finished.Cancelled,
SummarizationState.Finished.ErrorDismissed,
SummarizationState.LearnMoreAboutShakeConsent,
is SummarizationState.Loading,
is SummarizationState.Settings,
SummarizationState.ShakeConsentRequired,
SummarizationState.ShakeConsentWithDownloadRequired,
is SummarizationState.Summarizing,
-> {}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,17 @@ package org.mozilla.fenix.summarization

import mozilla.components.concept.llm.Llm
import mozilla.components.feature.summarize.ContentExtracted
import mozilla.components.feature.summarize.DownloadConsentAction
import mozilla.components.feature.summarize.DownloadErrorAction
import mozilla.components.feature.summarize.DownloadInProgressAction
import mozilla.components.feature.summarize.ErrorAction
import mozilla.components.feature.summarize.LlmProviderAction
import mozilla.components.feature.summarize.OffDeviceSummarizationShakeConsentAction
import mozilla.components.feature.summarize.OnDeviceSummarizationShakeConsentAction
import mozilla.components.feature.summarize.ReceivedParsedDocument
import mozilla.components.feature.summarize.SettingsBackClicked
import mozilla.components.feature.summarize.SettingsClicked
import mozilla.components.feature.summarize.ShakeConsentRequested
import mozilla.components.feature.summarize.SummarizationAction
import mozilla.components.feature.summarize.SummarizationCompleted
import mozilla.components.feature.summarize.SummarizationFailed
Expand Down Expand Up @@ -147,7 +154,22 @@ class SummarizationTelemetryMiddleware(
)
}

else -> {}
DownloadConsentAction.AllowClicked,
DownloadConsentAction.CancelClicked,
DownloadConsentAction.LearnMoreClicked,
DownloadErrorAction.CancelClicked,
DownloadErrorAction.LearnMoreClicked,
DownloadErrorAction.TryAgainClicked,
DownloadInProgressAction.CancelClicked,
ErrorAction.ErrorDismissed,
ErrorAction.LearnMoreClicked,
LlmProviderAction.ProviderAvailable,
OffDeviceSummarizationShakeConsentAction.LearnMoreClicked,
OnDeviceSummarizationShakeConsentAction.LearnMoreClicked,
SettingsBackClicked,
SettingsClicked,
ShakeConsentRequested,
-> {}
}
}

Expand Down