From 9a30e07e1a9b47bc2759b5a825e6b32ae067448c Mon Sep 17 00:00:00 2001 From: Shane Osbourne Date: Sun, 19 Jan 2025 08:12:20 +0000 Subject: [PATCH] duckplayer: revert landscape impression pixel --- .../app/browser/BrowserTabViewModelTest.kt | 16 ---------- .../browser/duckplayer/DuckPlayerJSHelper.kt | 29 ------------------- .../com/duckduckgo/app/pixels/AppPixelName.kt | 1 - .../impl/DuckPlayerScriptsJsMessaging.kt | 1 - 4 files changed, 47 deletions(-) diff --git a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt index bb7a9dc2659d..41205306f179 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/browser/BrowserTabViewModelTest.kt @@ -152,7 +152,6 @@ import com.duckduckgo.app.onboarding.ui.page.extendedonboarding.ExtendedOnboardi import com.duckduckgo.app.onboarding.ui.page.extendedonboarding.HighlightsOnboardingExperimentManager import com.duckduckgo.app.pixels.AppPixelName import com.duckduckgo.app.pixels.AppPixelName.AUTOCOMPLETE_BANNER_SHOWN -import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_LANDSCAPE_LAYOUT_IMPRESSIONS import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_SETTING_ALWAYS_DUCK_PLAYER import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_SETTING_ALWAYS_OVERLAY_YOUTUBE import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_SETTING_NEVER_OVERLAY_YOUTUBE @@ -4680,21 +4679,6 @@ class BrowserTabViewModelTest { assertCommandNotIssued() } - @Test - fun whenProcessJsCallbackMessageTelemetryEventThenFirePixel() = runTest { - whenever(mockEnabledToggle.isEnabled()).thenReturn(true) - whenever(mockDuckPlayer.getUserPreferences()).thenReturn(UserPreferences(overlayInteracted = true, privatePlayerMode = AlwaysAsk)) - testee.processJsCallbackMessage( - DUCK_PLAYER_PAGE_FEATURE_NAME, - "telemetryEvent", - "id", - JSONObject("""{"attributes": {"name": "impression", "value": "landscape-layout"}}"""), - false, - { "someUrl" }, - ) - verify(mockPixel).fire(DUCK_PLAYER_LANDSCAPE_LAYOUT_IMPRESSIONS) - } - @Test fun whenJsCallbackMessageInitialSetupFromOverlayThenSendResponseToJs() = runTest { whenever(mockEnabledToggle.isEnabled()).thenReturn(true) diff --git a/app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt b/app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt index 23a6eb5645d8..56a6e9a6005b 100644 --- a/app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt +++ b/app/src/main/java/com/duckduckgo/app/browser/duckplayer/DuckPlayerJSHelper.kt @@ -26,7 +26,6 @@ import com.duckduckgo.app.browser.commands.Command.SendResponseToDuckPlayer import com.duckduckgo.app.browser.commands.Command.SendResponseToJs import com.duckduckgo.app.browser.commands.Command.SendSubscriptions import com.duckduckgo.app.browser.commands.NavigationCommand.Navigate -import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_LANDSCAPE_LAYOUT_IMPRESSIONS import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_SETTING_ALWAYS_DUCK_PLAYER import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_SETTING_ALWAYS_OVERLAY_YOUTUBE import com.duckduckgo.app.pixels.AppPixelName.DUCK_PLAYER_SETTING_ALWAYS_SERP @@ -238,34 +237,6 @@ class DuckPlayerJSHelper @Inject constructor( "reportPageException", "reportInitException" -> { Timber.tag(method).d(data.toString()) } - "telemetryEvent" -> { - val attributes = data?.getJSONObject("attributes") - - if (attributes?.getString("name") == "impression" && attributes.getString("value") == "landscape-layout") { - pixel.fire(DUCK_PLAYER_LANDSCAPE_LAYOUT_IMPRESSIONS) - } - - /* TODO (cbarreiro) Abstract this to provide better support for telemetry events - * https://app.asana.com/0/1202552961248957/1208690124356904/f */ - /** - * incoming data looks like this, where `name` is used to discriminate, - * and 'value' is linked to it (but is optional) - * - * { - * "attributes": { - * "name": "impression", - * "value": "landscape-layout" - * } - * } - * - * Another event might look like this in the future: (note: no 'value' field) - * { - * "attributes": { - * "name": "page-view" - * } - * } - */ - } "openSettings" -> { return OpenDuckPlayerSettings } diff --git a/app/src/main/java/com/duckduckgo/app/pixels/AppPixelName.kt b/app/src/main/java/com/duckduckgo/app/pixels/AppPixelName.kt index 61a756293d2f..e7a91986288a 100644 --- a/app/src/main/java/com/duckduckgo/app/pixels/AppPixelName.kt +++ b/app/src/main/java/com/duckduckgo/app/pixels/AppPixelName.kt @@ -361,7 +361,6 @@ enum class AppPixelName(override val pixelName: String) : Pixel.PixelName { DUCK_PLAYER_SETTING_NEVER_SERP("duckplayer_setting_never_overlay_serp"), DUCK_PLAYER_SETTING_NEVER_OVERLAY_YOUTUBE("duckplayer_setting_never_overlay_youtube"), DUCK_PLAYER_SETTING_ALWAYS_DUCK_PLAYER("duckplayer_setting_always_duck-player"), - DUCK_PLAYER_LANDSCAPE_LAYOUT_IMPRESSIONS("duckplayer_landscape_layout_impressions"), ADD_BOOKMARK_CONFIRM_EDITED("m_add_bookmark_confirm_edit"), diff --git a/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerScriptsJsMessaging.kt b/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerScriptsJsMessaging.kt index 8374b0adf44c..39ab67ccfb48 100644 --- a/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerScriptsJsMessaging.kt +++ b/duckplayer/duckplayer-impl/src/main/java/com/duckduckgo/duckplayer/impl/DuckPlayerScriptsJsMessaging.kt @@ -131,7 +131,6 @@ class DuckPlayerScriptsJsMessaging @Inject constructor( "setUserValues", "reportPageException", "reportInitException", - "telemetryEvent", ) } }