diff --git a/app/metrics.yaml b/app/metrics.yaml index 1867fa544..79036eb55 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -561,6 +561,17 @@ bookmarks_management: notification_emails: - fenix-core@mozilla.com expires: "2020-03-01" + folder_remove: + type: event + description: > + A user removed a bookmark folder. + bugs: + - 3174 + data_reviews: + - https://github.com/mozilla-mobile/fenix/pull/3724 + notification_emails: + - fenix-core@mozilla.com + expires: "2020-03-01" custom_tab: closed: 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 3a2d7384c..15ab9d2c3 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 @@ -154,6 +154,9 @@ private val Event.wrapper is Event.AddBookmarkFolder -> EventWrapper( { BookmarksManagement.folderAdd.record(it) } ) + is Event.RemoveBookmarkFolder -> EventWrapper( + { BookmarksManagement.folderRemove.record(it) } + ) is Event.CustomTabsMenuOpened -> EventWrapper( { CustomTab.menu.record(it) } ) diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt index 0f8cda835..68501767e 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Metrics.kt @@ -65,6 +65,7 @@ sealed class Event { object ShareBookmark : Event() object CopyBookmark : Event() object AddBookmarkFolder : Event() + object RemoveBookmarkFolder : Event() object RemoveBookmarks : Event() object QuickActionSheetOpened : Event() object QuickActionSheetClosed : Event() diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt index 8d31955e1..240a6317a 100644 --- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkFragment.kt @@ -298,7 +298,11 @@ class BookmarkFragment : Fragment(), BackHandler, AccountObserver { val deleteOperation: (suspend () -> Unit) = { bookmarkStorage?.deleteNode(bookmarkNode.guid) - metrics()?.track(Event.RemoveBookmark) + when (bookmarkNode.type) { + BookmarkNodeType.FOLDER -> metrics()?.track(Event.RemoveBookmarkFolder) + BookmarkNodeType.ITEM -> metrics()?.track(Event.RemoveBookmark) + else -> { } + } pendingBookmarkDeletionJob = null refreshBookmarks() } diff --git a/docs/metrics.md b/docs/metrics.md index eb1c38420..953a8056d 100644 --- a/docs/metrics.md +++ b/docs/metrics.md @@ -435,6 +435,15 @@ tracking_protection 2020-03-01 + + + folder_remove + event + A user removed a bookmark folder. + link + + 2020-03-01 + @@ -821,4 +830,4 @@ Data that is sent in the activation ping 2019-10-01 - \ No newline at end of file +