diff --git a/app/metrics.yaml b/app/metrics.yaml index 0ffdad0c28..fbd0fdbd4a 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -3659,122 +3659,6 @@ logins: - android-probes@mozilla.com expires: "2022-02-01" -download_notification: - resume: - type: event - description: | - A user resumed a download in the download notification - bugs: - - https://github.com/mozilla-mobile/fenix/issues/5583 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6554 - - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877 - - https://github.com/mozilla-mobile/fenix/pull/18143 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-07-01" - pause: - type: event - description: | - A user paused a download in the download notification - bugs: - - https://github.com/mozilla-mobile/fenix/issues/5583 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6554 - - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877 - - https://github.com/mozilla-mobile/fenix/pull/18143 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-07-01" - cancel: - type: event - description: | - A user cancelled a download in the download notification - bugs: - - https://github.com/mozilla-mobile/fenix/issues/5583 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6554 - - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877 - - https://github.com/mozilla-mobile/fenix/pull/18143 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-07-01" - try_again: - type: event - description: | - A user tapped on try again when a download fails in the download - notification - bugs: - - https://github.com/mozilla-mobile/fenix/issues/5583 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6554 - - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877 - - https://github.com/mozilla-mobile/fenix/pull/18143 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-07-01" - open: - type: event - description: | - A user opened a downloaded file in the download notification - bugs: - - https://github.com/mozilla-mobile/fenix/issues/5583 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6554 - - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877 - - https://github.com/mozilla-mobile/fenix/pull/18143 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-07-01" - in_app_open: - type: event - description: | - A user opened a downloaded file in the in-app notification link - bugs: - - https://github.com/mozilla-mobile/fenix/issues/5583 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6554 - - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877 - - https://github.com/mozilla-mobile/fenix/pull/18143 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-07-01" - in_app_try_again: - type: event - description: | - A user tapped on try again when a download fails in the in-app - notification link - bugs: - - https://github.com/mozilla-mobile/fenix/issues/5583 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/6554 - - https://github.com/mozilla-mobile/fenix/pull/13958#issuecomment-676857877 - - https://github.com/mozilla-mobile/fenix/pull/18143 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-07-01" - downloads_misc: download_added: type: event diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt index 4c8a5a62d6..e578e70408 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt @@ -115,13 +115,6 @@ sealed class Event { object MediaStopState : Event() object MediaFullscreenState : Event() object MediaPictureInPictureState : Event() - object InAppNotificationDownloadOpen : Event() - object InAppNotificationDownloadTryAgain : Event() - object NotificationDownloadCancel : Event() - object NotificationDownloadOpen : Event() - object NotificationDownloadPause : Event() - object NotificationDownloadResume : Event() - object NotificationDownloadTryAgain : Event() object DownloadAdded : Event() object DownloadsScreenOpened : Event() object DownloadsItemOpened : Event() diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt index b31e5f04f6..dc5c5bd718 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt @@ -23,7 +23,6 @@ import org.mozilla.fenix.GleanMetrics.ContextMenu import org.mozilla.fenix.GleanMetrics.ContextualMenu import org.mozilla.fenix.GleanMetrics.CrashReporter import org.mozilla.fenix.GleanMetrics.CustomTab -import org.mozilla.fenix.GleanMetrics.DownloadNotification import org.mozilla.fenix.GleanMetrics.DownloadsMisc import org.mozilla.fenix.GleanMetrics.DownloadsManagement import org.mozilla.fenix.GleanMetrics.ErrorPage @@ -438,27 +437,6 @@ private val Event.wrapper: EventWrapper<*>? is Event.MediaPictureInPictureState -> EventWrapper( { MediaState.pictureInPicture.record(it) } ) - is Event.InAppNotificationDownloadOpen -> EventWrapper( - { DownloadNotification.inAppOpen.record(it) } - ) - is Event.InAppNotificationDownloadTryAgain -> EventWrapper( - { DownloadNotification.inAppTryAgain.record(it) } - ) - is Event.NotificationDownloadCancel -> EventWrapper( - { DownloadNotification.cancel.record(it) } - ) - is Event.NotificationDownloadOpen -> EventWrapper( - { DownloadNotification.open.record(it) } - ) - is Event.NotificationDownloadPause -> EventWrapper( - { DownloadNotification.pause.record(it) } - ) - is Event.NotificationDownloadResume -> EventWrapper( - { DownloadNotification.resume.record(it) } - ) - is Event.NotificationDownloadTryAgain -> EventWrapper( - { DownloadNotification.tryAgain.record(it) } - ) is Event.DownloadAdded -> EventWrapper( { DownloadsMisc.downloadAdded.record(it) } ) diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt index 3530863bf5..d0745a37ea 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt @@ -189,17 +189,6 @@ internal class ReleaseMetricController( Component.FEATURE_CUSTOMTABS to CustomTabsFacts.Items.CLOSE -> Event.CustomTabsClosed Component.FEATURE_CUSTOMTABS to CustomTabsFacts.Items.ACTION_BUTTON -> Event.CustomTabsActionTapped - Component.FEATURE_DOWNLOADS to DownloadsFacts.Items.NOTIFICATION -> { - when (action) { - Action.CANCEL -> Event.NotificationDownloadCancel - Action.OPEN -> Event.NotificationDownloadOpen - Action.PAUSE -> Event.NotificationDownloadPause - Action.RESUME -> Event.NotificationDownloadResume - Action.TRY_AGAIN -> Event.NotificationDownloadTryAgain - else -> null - } - } - Component.FEATURE_MEDIA to MediaFacts.Items.NOTIFICATION -> { when (action) { Action.PLAY -> Event.NotificationMediaPlay diff --git a/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt b/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt index 518dd569a6..2c04c1f6b9 100644 --- a/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt +++ b/app/src/main/java/org/mozilla/fenix/downloads/DynamicDownloadDialog.kt @@ -79,7 +79,6 @@ class DynamicDownloadDialog( ) setOnClickListener { tryAgain(downloadState.id) - context.metrics.track(Event.InAppNotificationDownloadTryAgain) dismiss() } } @@ -110,7 +109,6 @@ class DynamicDownloadDialog( onCannotOpenFile(downloadState) } - context.metrics.track(Event.InAppNotificationDownloadOpen) dismiss() } }