For #3174: Adds telemetry for bookmarks

mozilla-mobile · Jun 27, 2019 · 3b77914 · 3b77914
1 parent c9962a7
commit 3b77914
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git 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
@@ -154,6 +154,9 @@ private val Event.wrapper
         is Event.AddBookmarkFolder -> EventWrapper<NoExtraKeys>(
             { BookmarksManagement.folderAdd.record(it) }
         )
+        is Event.RemoveBookmarkFolder -> EventWrapper<NoExtraKeys>(
+            { BookmarksManagement.folderRemove.record(it) }
+        )
         is Event.CustomTabsMenuOpened -> EventWrapper<NoExtraKeys>(
             { 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
@@ -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
@@ -296,7 +296,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()
         }