For mozilla-mobile#19886 - Remove tracking protection overlay CFR

fork-maintainers · Aug 16, 2021 · 4b2b058 · 4b2b058
1 parent dbb6819
commit 4b2b058
Show file tree

Hide file tree

Showing 18 changed files with 5 additions and 715 deletions.
diff --git a/app/metrics.yaml b/app/metrics.yaml
@@ -3117,77 +3117,6 @@ private_browsing_mode:
       - android-probes@mozilla.com
     expires: "2021-08-01"
 
-contextual_hint.tracking_protection:
-  display:
-    type: event
-    description: |
-      The enhanced tracking protection contextual hint was
-      displayed.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/9625
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/11923
-      - 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"
-  dismiss:
-    type: event
-    description: |
-      The enhanced tracking protection contextual hint was
-      dismissed
-      by pressing the close button
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/9625
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/11923
-      - 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"
-  outside_tap:
-    type: event
-    description: |
-      The user tapped outside of the etp contextual hint
-      (which has no effect).
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/9625
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/11923
-      - 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"
-  inside_tap:
-    type: event
-    description: |
-      The user tapped inside of the etp contextual hint
-      (which brings up the etp panel for this site).
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/9625
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/11923
-      - 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"
-
 tracking_protection:
   exception_added:
     type: event

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt
@@ -665,7 +665,7 @@ class SmokeTest {
         }.openNavigationToolbar {
         }.openTrackingProtectionTestPage(trackingProtectionPage.url, true) {}
         enhancedTrackingProtection {
-            verifyEnhancedTrackingProtectionNotice()
+            verifyEnhancedTrackingProtectionShield()
         }.closeNotificationPopup {}
     }
 

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/StrictEnhancedTrackingProtectionTest.kt
@@ -76,19 +76,6 @@ class StrictEnhancedTrackingProtectionTest {
         }
     }
 
-    @Test
-    fun testStrictVisitContentNotification() {
-        val trackingProtectionTest =
-            TestAssetHelper.getEnhancedTrackingProtectionAsset(mockWebServer)
-
-        navigationToolbar {
-        }.openTrackingProtectionTestPage(trackingProtectionTest.url, true) {}
-
-        enhancedTrackingProtection {
-            verifyEnhancedTrackingProtectionNotice()
-        }.closeNotificationPopup {}
-    }
-
     @Test
     fun testStrictVisitContentShield() {
         val trackingProtectionTest =
@@ -97,10 +84,6 @@ class StrictEnhancedTrackingProtectionTest {
         navigationToolbar {
         }.openTrackingProtectionTestPage(trackingProtectionTest.url, true) {}
 
-        enhancedTrackingProtection {
-            verifyEnhancedTrackingProtectionNotice()
-        }.closeNotificationPopup {}
-
         enhancedTrackingProtection {
             verifyEnhancedTrackingProtectionShield()
         }
@@ -114,10 +97,6 @@ class StrictEnhancedTrackingProtectionTest {
         navigationToolbar {
         }.openTrackingProtectionTestPage(trackingProtectionTest.url, true) {}
 
-        enhancedTrackingProtection {
-            verifyEnhancedTrackingProtectionNotice()
-        }.closeNotificationPopup {}
-
         enhancedTrackingProtection {
             verifyEnhancedTrackingProtectionShield()
         }.openEnhancedTrackingProtectionSheet {
@@ -133,10 +112,6 @@ class StrictEnhancedTrackingProtectionTest {
         navigationToolbar {
         }.openTrackingProtectionTestPage(trackingProtectionTest.url, true) {}
 
-        enhancedTrackingProtection {
-            verifyEnhancedTrackingProtectionNotice()
-        }.closeNotificationPopup {}
-
         enhancedTrackingProtection {
             verifyEnhancedTrackingProtectionShield()
         }.openEnhancedTrackingProtectionSheet {
@@ -163,10 +138,6 @@ class StrictEnhancedTrackingProtectionTest {
         navigationToolbar {
         }.openTrackingProtectionTestPage(trackingProtectionTest.url, true) {}
 
-        enhancedTrackingProtection {
-            verifyEnhancedTrackingProtectionNotice()
-        }.closeNotificationPopup {}
-
         enhancedTrackingProtection {
             verifyEnhancedTrackingProtectionShield()
         }.openEnhancedTrackingProtectionSheet {
@@ -195,10 +166,6 @@ class StrictEnhancedTrackingProtectionTest {
         navigationToolbar {
         }.openTrackingProtectionTestPage(trackingProtectionTest.url, true) {}
 
-        enhancedTrackingProtection {
-            verifyEnhancedTrackingProtectionNotice()
-        }.closeNotificationPopup {}
-
         enhancedTrackingProtection {
             verifyEnhancedTrackingProtectionShield()
         }.openEnhancedTrackingProtectionSheet {

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/BrowserRobot.kt
@@ -566,8 +566,6 @@ fun browserScreen(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
     return BrowserRobot.Transition()
 }
 
-private fun dismissOnboardingButton() = onView(withId(R.id.close_onboarding))
-
 fun dismissTrackingOnboarding() {
     mDevice.wait(Until.findObject(By.res("close_onboarding")), waitingTime)
     dismissOnboardingButton().click()

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/EnhancedTrackingProtectionRobot.kt
@@ -20,7 +20,6 @@ import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.hamcrest.Matchers.containsString
 import org.mozilla.fenix.R
-import org.mozilla.fenix.helpers.TestAssetHelper
 import org.mozilla.fenix.helpers.TestAssetHelper.waitingTime
 import org.mozilla.fenix.helpers.TestHelper.packageName
 import org.mozilla.fenix.helpers.click
@@ -34,8 +33,6 @@ class EnhancedTrackingProtectionRobot {
 
     val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())!!
 
-    fun verifyEnhancedTrackingProtectionNotice() = assertEnhancedTrackingProtectionNotice()
-
     fun verifyEnhancedTrackingProtectionShield() = assertEnhancedTrackingProtectionShield()
 
     fun verifyEnhancedTrackingProtectionSheetStatus(status: String, state: Boolean) =
@@ -103,13 +100,6 @@ fun enhancedTrackingProtection(interact: EnhancedTrackingProtectionRobot.() -> U
     return EnhancedTrackingProtectionRobot.Transition()
 }
 
-private fun assertEnhancedTrackingProtectionNotice() {
-    mDevice.waitNotNull(
-        Until.findObject(By.res("$packageName:id/onboarding_message")),
-        TestAssetHelper.waitingTime
-    )
-}
-
 private fun assertEnhancedTrackingProtectionShield() {
     mDevice.waitNotNull(
         Until.findObjects(By.descContains("Tracking Protection has blocked trackers"))

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/NavigationToolbarRobot.kt
@@ -32,7 +32,6 @@ import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
-import junit.framework.TestCase.assertTrue
 import org.hamcrest.CoreMatchers.allOf
 import org.hamcrest.CoreMatchers.anyOf
 import org.hamcrest.CoreMatchers.containsString
@@ -108,7 +107,6 @@ class NavigationToolbarRobot {
                 onView(
                     anyOf(
                         withResourceName("browserLayout"),
-                        withResourceName("onboarding_message"), // Req ETP dialog
                         withResourceName("download_button")
                     )
                 ).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
@@ -127,32 +125,8 @@ class NavigationToolbarRobot {
 
             awesomeBar().perform(replaceText(url.toString()), pressImeActionButton())
 
-            val onboardingMessage =
-                mDevice.findObject(UiSelector().resourceId("$packageName:id/onboarding_message"))
-
-            val onboardingDisplayed = onboardingMessage.waitForExists(waitingTime)
-
-            when (etpEnabled) {
-                true ->
-                    try {
-                        assertTrue(
-                            "Onboarding message not displayed",
-                            onboardingDisplayed
-                        )
-                    } catch (e: AssertionError) {
-                        openThreeDotMenu {
-                        }.stopPageLoad {
-                            if (!onboardingDisplayed) {
-                                openThreeDotMenu {
-                                }.refreshPage {
-                                    assertTrue(onboardingDisplayed)
-                                }
-                            }
-                        }
-                    }
-
-                false ->
-                    onView(withResourceName("browserLayout")).check(matches(isDisplayed()))
+            if (!etpEnabled) {
+                onView(withResourceName("browserLayout")).check(matches(isDisplayed()))
             }
 
             BrowserRobot().interact()
@@ -206,12 +180,7 @@ class NavigationToolbarRobot {
             awesomeBar().perform(replaceText(url.toString()), pressImeActionButton())
 
             runWithIdleRes(sessionLoadedIdlingResource) {
-                onView(
-                    anyOf(
-                        ViewMatchers.withResourceName("browserLayout"),
-                        ViewMatchers.withResourceName("onboarding_message") // Req for ETP dialog
-                    )
-                )
+                onView(ViewMatchers.withResourceName("browserLayout"))
                     .check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
             }
 
@@ -348,7 +317,6 @@ private fun assertTabButtonShortcutMenuItems() {
         .check(matches(hasDescendant(withText("New tab"))))
 }
 
-private fun dismissOnboardingButton() = onView(withId(R.id.close_onboarding))
 private fun urlBar() = onView(withId(R.id.toolbar))
 private fun awesomeBar() = onView(withId(R.id.mozac_browser_toolbar_edit_url_view))
 private fun threeDotButton() = onView(withId(R.id.mozac_browser_toolbar_menu))

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SearchRobot.kt
@@ -31,7 +31,6 @@ import androidx.test.uiautomator.UiObject
 import androidx.test.uiautomator.UiSelector
 import androidx.test.uiautomator.Until
 import org.hamcrest.CoreMatchers.allOf
-import org.hamcrest.CoreMatchers.anyOf
 import org.hamcrest.CoreMatchers.startsWith
 import org.hamcrest.Matchers
 import org.junit.Assert.assertEquals
@@ -173,12 +172,7 @@ class SearchRobot {
             browserToolbarEditView().perform(typeText(query + "\n"))
 
             runWithIdleRes(sessionLoadedIdlingResource) {
-                onView(
-                    anyOf(
-                        ViewMatchers.withResourceName("browserLayout"),
-                        ViewMatchers.withResourceName("onboarding_message") // Req ETP dialog
-                    )
-                )
+                onView(ViewMatchers.withResourceName("browserLayout"))
                     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
             }
 

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -41,7 +41,6 @@ import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.shortcut.PwaOnboardingObserver
 import org.mozilla.fenix.theme.ThemeManager
-import org.mozilla.fenix.trackingprotection.TrackingProtectionOverlay
 
 /**
  * Fragment used for browsing the web within the main app.
@@ -52,8 +51,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
 
     private val windowFeature = ViewBoundFeatureWrapper<WindowFeature>()
     private val openInAppOnboardingObserver = ViewBoundFeatureWrapper<OpenInAppOnboardingObserver>()
-    private val trackingProtectionOverlayObserver =
-        ViewBoundFeatureWrapper<TrackingProtectionOverlay>()
 
     private var readerModeAvailable = false
     private var pwaOnboardingObserver: PwaOnboardingObserver? = null
@@ -249,20 +246,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                 view = view
             )
         }
-        if (context.settings().shouldShowTrackingProtectionCfr) {
-            trackingProtectionOverlayObserver.set(
-                feature = TrackingProtectionOverlay(
-                    context = context,
-                    store = context.components.core.store,
-                    lifecycleOwner = viewLifecycleOwner,
-                    settings = context.settings(),
-                    metrics = context.components.analytics.metrics,
-                    getToolbar = { browserToolbarView.view }
-                ),
-                owner = this,
-                view = view
-            )
-        }
     }
 
     override fun onStart() {

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
@@ -171,11 +171,6 @@ sealed class Event {
     object LoginDialogPromptSave : Event()
     object LoginDialogPromptNeverSave : Event()
 
-    object ContextualHintETPDisplayed : Event()
-    object ContextualHintETPDismissed : Event()
-    object ContextualHintETPOutsideTap : Event()
-    object ContextualHintETPInsideTap : Event()
-
     // Tab tray
     object TabsTrayOpened : Event()
     object TabsTrayClosed : 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
@@ -20,7 +20,6 @@ import org.mozilla.fenix.GleanMetrics.BookmarksManagement
 import org.mozilla.fenix.GleanMetrics.BrowserSearch
 import org.mozilla.fenix.GleanMetrics.Collections
 import org.mozilla.fenix.GleanMetrics.ContextMenu
-import org.mozilla.fenix.GleanMetrics.ContextualHintTrackingProtection
 import org.mozilla.fenix.GleanMetrics.ContextualMenu
 import org.mozilla.fenix.GleanMetrics.CrashReporter
 import org.mozilla.fenix.GleanMetrics.CustomTab
@@ -642,22 +641,6 @@ private val Event.wrapper: EventWrapper<*>?
             { Onboarding.prefToggledToolbarPositionKeys.valueOf(it) }
         )
 
-        is Event.ContextualHintETPDisplayed -> EventWrapper<NoExtraKeys>(
-            { ContextualHintTrackingProtection.display.record(it) }
-        )
-
-        is Event.ContextualHintETPDismissed -> EventWrapper<NoExtraKeys>(
-            { ContextualHintTrackingProtection.dismiss.record(it) }
-        )
-
-        is Event.ContextualHintETPInsideTap -> EventWrapper<NoExtraKeys>(
-            { ContextualHintTrackingProtection.insideTap.record(it) }
-        )
-
-        is Event.ContextualHintETPOutsideTap -> EventWrapper<NoExtraKeys>(
-            { ContextualHintTrackingProtection.outsideTap.record(it) }
-        )
-
         is Event.TabsTrayOpened -> EventWrapper<NoExtraKeys>(
             { TabsTray.opened.record(it) }
         )