nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1895354 - Add micro survey trigger logic for printing feature r=android-reviewers,amejiamarmol

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D209601
This commit is contained in:
gela 2024-05-07 17:31:59 +00:00
parent 356f5f2fc4
commit 135097725b
3 changed files with 18 additions and 15 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
mobile/android/fenix/app/messaging-fenix.fml.yaml
View file

@ -44,6 +44,9 @@ import:
INACTIVE_4_DAYS: "'app_launched'|eventLastSeen('Days', 0) >= 4"
INACTIVE_5_DAYS: "'app_launched'|eventLastSeen('Days', 0) >= 5"
# Behavioral Targeting Events
RECENTLY_PRINTED: "'print_tapped'|eventLastSeen('Hours') <= 24"
# Has the user signed in the last 4 years
FXA_SIGNED_IN: "'sync_auth.sign_in'|eventLastSeen('Years', 0) <= 4"
FXA_NOT_SIGNED_IN: "'sync_auth.sign_in'|eventLastSeen('Years', 0) > 4"

4
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/SaveToPDFMiddleware.kt
View file

@ -16,6 +16,7 @@ import mozilla.components.browser.state.state.BrowserState
import mozilla.components.browser.state.state.TabSessionState
import mozilla.components.lib.state.Middleware
import mozilla.components.lib.state.MiddlewareContext
import org.mozilla.experiments.nimbus.NimbusEventStore
import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.R
import org.mozilla.fenix.browser.StandardSnackbarError
@ -35,10 +36,12 @@ import java.io.IOException
*
* @param context An Application context.
* @param mainScope Coroutine scope to launch coroutines.
* @param nimbusEventStore Nimbus event store for recording events.
*/
class SaveToPDFMiddleware(
private val context: Context,
private val mainScope: CoroutineScope = CoroutineScope(Dispatchers.Main),
private val nimbusEventStore: NimbusEventStore = context.components.nimbus.events,
) : Middleware<BrowserState, BrowserAction> {
override fun invoke(
@ -151,6 +154,7 @@ class SaveToPDFMiddleware(
source = telemetrySource(isPdf),
),
)
nimbusEventStore.recordEvent("print_tapped")
} else {
Events.saveToPdfTapped.record(
Events.SaveToPdfTappedExtra(

26
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/share/SaveToPDFMiddlewareTest.kt
View file

@ -4,7 +4,6 @@
package org.mozilla.fenix.share
import android.content.Context
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
@ -15,7 +14,6 @@ import mozilla.components.browser.state.store.BrowserStore
import mozilla.components.concept.engine.EngineSession
import mozilla.components.service.glean.testing.GleanTestRule
import mozilla.components.support.test.libstate.ext.waitUntilIdle
import mozilla.components.support.test.mock
import mozilla.components.support.test.robolectric.testContext
import mozilla.components.support.test.rule.MainCoroutineRule
import mozilla.components.support.test.rule.runTestOnMain
@ -25,6 +23,7 @@ import org.junit.Before
import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.mozilla.experiments.nimbus.NimbusEventStore
import org.mozilla.fenix.GleanMetrics.Events
import org.mozilla.fenix.R
import org.mozilla.fenix.browser.StandardSnackbarError
@ -48,8 +47,15 @@ class SaveToPDFMiddlewareTest {
// Only ERROR_PRINT_SETTINGS_SERVICE_NOT_AVAILABLE is available for testing
class MockGeckoPrintException() : GeckoSession.GeckoPrintException()
private lateinit var middleware: SaveToPDFMiddleware
private lateinit var eventStore: NimbusEventStore
@Before
fun setup() {
eventStore = mockk(relaxed = true)
middleware =
SaveToPDFMiddleware(context = testContext, nimbusEventStore = eventStore)
appStore = mockk(relaxed = true)
every { testContext.components.appStore } returns appStore
}
@ -58,7 +64,6 @@ class SaveToPDFMiddlewareTest {
fun `GIVEN a save to pdf request WHEN it fails unexpectedly THEN unknown failure telemetry is sent AND a snackbar error is shown`() =
runTestOnMain {
val exceptionToThrow = RuntimeException("reader save to pdf failed")
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -104,7 +109,6 @@ class SaveToPDFMiddlewareTest {
fun `GIVEN a save to pdf request WHEN it fails due to io THEN io failure telemetry is sent AND a snackbar error is shown`() =
runTestOnMain {
val exceptionToThrow = IOException()
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -148,7 +152,6 @@ class SaveToPDFMiddlewareTest {
fun `GIVEN a save to pdf request WHEN it fails due to print exception THEN print exception failure telemetry is sent AND a snackbar error is shown`() =
runTestOnMain {
val exceptionToThrow = MockGeckoPrintException()
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -191,7 +194,6 @@ class SaveToPDFMiddlewareTest {
@Test
fun `GIVEN a save to pdf request WHEN it completes THEN completed telemetry is sent`() =
runTestOnMain {
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -223,7 +225,6 @@ class SaveToPDFMiddlewareTest {
@Test
fun `GIVEN a save to pdf request WHEN it the action begins THEN tapped telemetry is sent`() =
runTestOnMain {
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -254,8 +255,6 @@ class SaveToPDFMiddlewareTest {
@Test
fun `GIVEN a save as pdf exception THEN should calculate the correct failure reason for telemetry`() = runTestOnMain {
val mockContext: Context = mock()
val middleware = SaveToPDFMiddleware(mockContext)
val noSettingsService = middleware.telemetryErrorReason(MockGeckoPrintException())
assertEquals("no_settings_service", noSettingsService)
val ioException = middleware.telemetryErrorReason(IOException())
@ -266,8 +265,6 @@ class SaveToPDFMiddlewareTest {
@Test
fun `GIVEN a save as pdf page type THEN should calculate the correct page source for telemetry`() = runTestOnMain {
val mockContext: Context = mock()
val middleware = SaveToPDFMiddleware(mockContext)
assertEquals("pdf", middleware.telemetrySource(isPdfViewer = true))
assertEquals("non-pdf", middleware.telemetrySource(isPdfViewer = false))
assertEquals("unknown", middleware.telemetrySource(isPdfViewer = null))
@ -276,7 +273,6 @@ class SaveToPDFMiddlewareTest {
@Test
fun `GIVEN a print request WHEN it fails unexpectedly THEN unknown failure telemetry is sent AND a snackbar error is shown`() = runTestOnMain {
val exceptionToThrow = RuntimeException("No Print Spooler")
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -321,7 +317,6 @@ class SaveToPDFMiddlewareTest {
@Test
fun `GIVEN a print request WHEN it fails due to print exception THEN print exception failure telemetry is sent AND a snackbar error is shown`() = runTestOnMain {
val exceptionToThrow = MockGeckoPrintException()
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -363,7 +358,6 @@ class SaveToPDFMiddlewareTest {
@Test
fun `GIVEN a print request WHEN it completes THEN completed telemetry is sent`() = runTestOnMain {
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -394,7 +388,6 @@ class SaveToPDFMiddlewareTest {
@Test
fun `GIVEN a print request WHEN it the action begins THEN tapped telemetry is sent`() = runTestOnMain {
val middleware = SaveToPDFMiddleware(testContext)
val mockEngineSession: EngineSession = mockk<EngineSession>().apply {
every {
checkForPdfViewer(any(), any())
@ -421,5 +414,8 @@ class SaveToPDFMiddlewareTest {
assertNotNull(response)
val source = response?.firstOrNull()?.extra?.get("source")
assertEquals("non-pdf", source)
verify {
eventStore.recordEvent("print_tapped")
}
}
}