From dbc329f8b6f287f23a4d8e51a8eed618e4e8d385 Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Thu, 31 Mar 2022 12:35:19 +0300
Subject: [PATCH] For #24210: Remove wrapper from copy url event.

---
 .../main/java/org/mozilla/fenix/components/metrics/Event.kt  | 2 --
 .../mozilla/fenix/components/metrics/GleanMetricsService.kt  | 3 ---
 .../main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt  | 5 +++--
 3 files changed, 3 insertions(+), 7 deletions(-)

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 b70936a4d..e69d6cc6f 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
@@ -126,8 +126,6 @@ sealed class Event {
 
     object TabSettingsOpened : Event()
 
-    object CopyUrlUsed : Event()
-
     object SyncedTabOpened : Event()
 
     object RecentlyClosedTabsOpenedOld : 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 21bea6ac1..c3f61e8fc 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
@@ -367,9 +367,6 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.ProgressiveWebAppInstallAsShortcut -> EventWrapper<NoExtraKeys>(
             { ProgressiveWebApp.installTap.record(it) }
         )
-        is Event.CopyUrlUsed -> EventWrapper<NoExtraKeys>(
-            { Events.copyUrlTapped.record(it) }
-        )
 
         is Event.SyncedTabOpened -> EventWrapper<NoExtraKeys>(
             { Events.syncedTabOpened.record(it) }
diff --git a/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt b/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
index a6bf67bc1..6d1ead820 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/ToolbarPopupWindow.kt
@@ -18,11 +18,12 @@ import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.store.BrowserStore
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
-import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.components
 import java.lang.ref.WeakReference
 import mozilla.components.browser.state.selector.findCustomTab
+import mozilla.components.service.glean.private.NoExtras
 import mozilla.components.support.base.log.logger.Logger
+import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.databinding.BrowserToolbarPopupWindowBinding
 
 object ToolbarPopupWindow {
@@ -77,7 +78,7 @@ object ToolbarPopupWindow {
                         .setText(context.getString(R.string.browser_toolbar_url_copied_to_clipboard_snackbar))
                         .show()
                 }
-                context.components.analytics.metrics.track(Event.CopyUrlUsed)
+                Events.copyUrlTapped.record(NoExtras())
             }
         }