|
|
@ -38,7 +38,6 @@ import org.mozilla.fenix.GleanMetrics.Preferences
|
|
|
|
import org.mozilla.fenix.GleanMetrics.PrivateBrowsingMode
|
|
|
|
import org.mozilla.fenix.GleanMetrics.PrivateBrowsingMode
|
|
|
|
import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcut
|
|
|
|
import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcut
|
|
|
|
import org.mozilla.fenix.GleanMetrics.ProgressiveWebApp
|
|
|
|
import org.mozilla.fenix.GleanMetrics.ProgressiveWebApp
|
|
|
|
import org.mozilla.fenix.GleanMetrics.QrScanner
|
|
|
|
|
|
|
|
import org.mozilla.fenix.GleanMetrics.ReaderMode
|
|
|
|
import org.mozilla.fenix.GleanMetrics.ReaderMode
|
|
|
|
import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine
|
|
|
|
import org.mozilla.fenix.GleanMetrics.SearchDefaultEngine
|
|
|
|
import org.mozilla.fenix.GleanMetrics.SearchShortcuts
|
|
|
|
import org.mozilla.fenix.GleanMetrics.SearchShortcuts
|
|
|
@ -229,18 +228,6 @@ private val Event.wrapper: EventWrapper<*>?
|
|
|
|
is Event.UriOpened -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.UriOpened -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ Events.totalUriCount.add(1) }
|
|
|
|
{ Events.totalUriCount.add(1) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|
is Event.QRScannerOpened -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ QrScanner.opened.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.QRScannerPromptDisplayed -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ QrScanner.promptDisplayed.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.QRScannerNavigationAllowed -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ QrScanner.navigationAllowed.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.QRScannerNavigationDenied -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ QrScanner.navigationDenied.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.ErrorPageVisited -> EventWrapper(
|
|
|
|
is Event.ErrorPageVisited -> EventWrapper(
|
|
|
|
{ ErrorPage.visitedError.record(it) },
|
|
|
|
{ ErrorPage.visitedError.record(it) },
|
|
|
|
{ ErrorPage.visitedErrorKeys.valueOf(it) }
|
|
|
|
{ ErrorPage.visitedErrorKeys.valueOf(it) }
|
|
|
@ -269,9 +256,6 @@ private val Event.wrapper: EventWrapper<*>?
|
|
|
|
is Event.SyncAuthOtherExternal -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.SyncAuthOtherExternal -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ SyncAuth.otherExternal.record(it) }
|
|
|
|
{ SyncAuth.otherExternal.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|
is Event.SyncAuthFromSharedReuse, Event.SyncAuthFromSharedCopy -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ SyncAuth.autoLogin.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.SyncAuthRecovered -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.SyncAuthRecovered -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ SyncAuth.recovered.record(it) }
|
|
|
|
{ SyncAuth.recovered.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
@ -284,9 +268,6 @@ private val Event.wrapper: EventWrapper<*>?
|
|
|
|
is Event.SyncAccountOpened -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.SyncAccountOpened -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ SyncAccount.opened.record(it) }
|
|
|
|
{ SyncAccount.opened.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|
is Event.SyncAccountClosed -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ SyncAccount.closed.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.SyncAccountSyncNow -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.SyncAccountSyncNow -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ SyncAccount.syncNow.record(it) }
|
|
|
|
{ SyncAccount.syncNow.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
@ -375,21 +356,12 @@ private val Event.wrapper: EventWrapper<*>?
|
|
|
|
is Event.SearchWidgetVoiceSearchPressed -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.SearchWidgetVoiceSearchPressed -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ SearchWidget.voiceButton.record(it) }
|
|
|
|
{ SearchWidget.voiceButton.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|
is Event.PrivateBrowsingGarbageIconTapped -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ PrivateBrowsingMode.garbageIcon.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.PrivateBrowsingSnackbarUndoTapped -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.PrivateBrowsingSnackbarUndoTapped -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ PrivateBrowsingMode.snackbarUndo.record(it) }
|
|
|
|
{ PrivateBrowsingMode.snackbarUndo.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|
is Event.PrivateBrowsingNotificationTapped -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.PrivateBrowsingNotificationTapped -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ PrivateBrowsingMode.notificationTapped.record(it) }
|
|
|
|
{ PrivateBrowsingMode.notificationTapped.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|
is Event.PrivateBrowsingNotificationOpenTapped -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ PrivateBrowsingMode.notificationOpen.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.PrivateBrowsingNotificationDeleteAndOpenTapped -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ PrivateBrowsingMode.notificationDelete.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.PrivateBrowsingCreateShortcut -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.PrivateBrowsingCreateShortcut -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ PrivateBrowsingShortcut.createShortcut.record(it) }
|
|
|
|
{ PrivateBrowsingShortcut.createShortcut.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
@ -582,9 +554,6 @@ private val Event.wrapper: EventWrapper<*>?
|
|
|
|
{ Events.tabCounterMenuAction.record(it) },
|
|
|
|
{ Events.tabCounterMenuAction.record(it) },
|
|
|
|
{ Events.tabCounterMenuActionKeys.valueOf(it) }
|
|
|
|
{ Events.tabCounterMenuActionKeys.valueOf(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
|
is Event.OnboardingWhatsNew -> EventWrapper<NoExtraKeys>(
|
|
|
|
|
|
|
|
{ Onboarding.whatsNew.record(it) }
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
is Event.OnboardingPrivateBrowsing -> EventWrapper<NoExtraKeys>(
|
|
|
|
is Event.OnboardingPrivateBrowsing -> EventWrapper<NoExtraKeys>(
|
|
|
|
{ Onboarding.prefToggledPrivateBrowsing.record(it) }
|
|
|
|
{ Onboarding.prefToggledPrivateBrowsing.record(it) }
|
|
|
|
)
|
|
|
|
)
|
|
|
@ -708,6 +677,7 @@ private val Event.wrapper: EventWrapper<*>?
|
|
|
|
is Event.AddonInstalled -> null
|
|
|
|
is Event.AddonInstalled -> null
|
|
|
|
is Event.SearchWidgetInstalled -> null
|
|
|
|
is Event.SearchWidgetInstalled -> null
|
|
|
|
is Event.ChangedToDefaultBrowser -> null
|
|
|
|
is Event.ChangedToDefaultBrowser -> null
|
|
|
|
|
|
|
|
is Event.SyncAuthFromSharedReuse, Event.SyncAuthFromSharedCopy -> null
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
class GleanMetricsService(
|
|
|
|
class GleanMetricsService(
|
|
|
|