Merge branch 'main' into import-l10n

mozilla-mobile · Jan 6, 2023 · 2490e8c · 2490e8c
2 parents 6cdf7fb + 804d286
commit 2490e8c
Show file tree

Hide file tree

Showing 41 changed files with 664 additions and 118 deletions.
diff --git a/app/metrics.yaml b/app/metrics.yaml
@@ -6932,6 +6932,72 @@ cookie_banners:
     metadata:
       tags:
         - Privacy&Security
+  visited_re_engagement_dialog:
+    type: event
+    description: An user visited the cookie banner re-engagement dialog
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1797593
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/28405#issuecomment-1372489596
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - [email protected]
+    expires: 118
+    metadata:
+      tags:
+        - Privacy&Security
+  opt_out_re_engagement_dialog:
+    type: event
+    description: |
+      An user opt out the cookie banner re-engagement
+      dialog by clicking the X button
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1797593
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/28405#issuecomment-1372489596
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - [email protected]
+    expires: 118
+    metadata:
+      tags:
+        - Privacy&Security
+  not_now_re_engagement_dialog:
+    type: event
+    description: |
+      An user clicked the not now button on
+      the cookie banner re-engagement dialog
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1797593
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/28405#issuecomment-1372489596
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - [email protected]
+    expires: 118
+    metadata:
+      tags:
+        - Privacy&Security
+  allow_re_engagement_dialog:
+    type: event
+    description: |
+      An user clicked the dismiss banner button
+      on the cookie banner re-engagement dialog
+    bugs:
+      - https://bugzilla.mozilla.org/show_bug.cgi?id=1797593
+    data_reviews:
+      - https://github.com/mozilla-mobile/fenix/pull/28405#issuecomment-1372489596
+    data_sensitivity:
+      - interaction
+    notification_emails:
+      - [email protected]
+    expires: 118
+    metadata:
+      tags:
+        - Privacy&Security
 site_permissions:
   prompt_shown:
     type: event

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SettingsPrivacyTest.kt
@@ -17,6 +17,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.R
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
@@ -53,6 +54,7 @@ class SettingsPrivacyTest {
     @Before
     fun setUp() {
         mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
+        appContext.settings().userOptOutOfReEngageCookieBannerDialog = true
         mockWebServer = MockWebServer().apply {
             dispatcher = AndroidAssetDispatcher()
             start()

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SponsoredShortcutsTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SponsoredShortcutsTest.kt
@@ -13,10 +13,12 @@ import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
+import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.helpers.AndroidAssetDispatcher
 import org.mozilla.fenix.helpers.Constants.defaultTopSitesList
 import org.mozilla.fenix.helpers.HomeActivityIntentTestRule
 import org.mozilla.fenix.helpers.TestAssetHelper
+import org.mozilla.fenix.helpers.TestHelper
 import org.mozilla.fenix.helpers.TestHelper.exitMenu
 import org.mozilla.fenix.helpers.TestHelper.getSponsoredShortcutTitle
 import org.mozilla.fenix.ui.robots.homeScreen
@@ -37,6 +39,7 @@ class SponsoredShortcutsTest {
 
     @Before
     fun setUp() {
+        TestHelper.appContext.settings().userOptOutOfReEngageCookieBannerDialog = true
         mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         mockWebServer = MockWebServer().apply {
             dispatcher = AndroidAssetDispatcher()

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -15,11 +15,14 @@ import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
 import mozilla.components.browser.state.selector.findTab
 import mozilla.components.browser.state.state.SessionState
 import mozilla.components.browser.state.state.TabSessionState
+import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.browser.thumbnails.BrowserThumbnails
 import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.concept.engine.permission.SitePermissions
@@ -28,9 +31,11 @@ import mozilla.components.feature.contextmenu.ContextMenuCandidate
 import mozilla.components.feature.readerview.ReaderViewFeature
 import mozilla.components.feature.tab.collections.TabCollection
 import mozilla.components.feature.tabs.WindowFeature
+import mozilla.components.lib.state.ext.consumeFlow
 import mozilla.components.service.glean.private.NoExtras
 import mozilla.components.support.base.feature.UserInteractionHandler
 import mozilla.components.support.base.feature.ViewBoundFeatureWrapper
+import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged
 import org.mozilla.fenix.GleanMetrics.ReaderMode
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.FenixSnackbar
@@ -43,6 +48,7 @@ import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.runIfFragmentIsAttached
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.nimbus.FxNimbus
+import org.mozilla.fenix.settings.quicksettings.protections.cookiebanners.dialog.CookieBannerReEngagementDialogUtils
 import org.mozilla.fenix.shortcut.PwaOnboardingObserver
 import org.mozilla.fenix.theme.ThemeManager
 
@@ -173,6 +179,9 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                 view = view,
             )
         }
+        if (!context.settings().shouldUseCookieBanner && !context.settings().userOptOutOfReEngageCookieBannerDialog) {
+            observeCookieBannerHandlingState(context.components.core.store)
+        }
     }
 
     override fun onUpdateToolbarForConfigurationChange(toolbar: BrowserToolbarView) {
@@ -370,12 +379,17 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
         useCase.containsException(tab.id) { hasTrackingProtectionException ->
             lifecycleScope.launch(Dispatchers.Main) {
                 val cookieBannersStorage = requireComponents.core.cookieBannersStorage
-                val hasCookieBannerException = withContext(Dispatchers.IO) {
-                    cookieBannersStorage.hasException(
-                        tab.content.url,
-                        tab.content.private,
-                    )
-                }
+                val hasCookieBannerException =
+                    if (requireContext().settings().shouldUseCookieBanner) {
+                        withContext(Dispatchers.IO) {
+                            cookieBannersStorage.hasException(
+                                tab.content.url,
+                                tab.content.private,
+                            )
+                        }
+                    } else {
+                        false
+                    }
                 runIfFragmentIsAttached {
                     val isTrackingProtectionEnabled =
                         tab.trackingProtection.enabled && !hasTrackingProtectionException
@@ -476,4 +490,22 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
     internal fun updateLastBrowseActivity() {
         requireContext().settings().lastBrowseActivity = System.currentTimeMillis()
     }
+
+    private fun observeCookieBannerHandlingState(store: BrowserStore) {
+        consumeFlow(store) { flow ->
+            flow.mapNotNull { state ->
+                state.findCustomTabOrSelectedTab(customTabSessionId)
+            }.ifAnyChanged { tab ->
+                arrayOf(
+                    tab.cookieBanner,
+                )
+            }.collect {
+                CookieBannerReEngagementDialogUtils.tryToShowReEngagementDialog(
+                    settings = requireContext().settings(),
+                    status = it.cookieBanner,
+                    navController = findNavController(),
+                )
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarCFRPresenter.kt
@@ -11,12 +11,14 @@ import androidx.compose.material.Text
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.unit.dp
+import androidx.navigation.findNavController
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.transformWhile
 import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab
+import mozilla.components.browser.state.selector.selectedTab
 import mozilla.components.browser.state.store.BrowserStore
 import mozilla.components.browser.toolbar.BrowserToolbar
 import mozilla.components.lib.state.ext.flowScoped
@@ -29,6 +31,7 @@ import org.mozilla.fenix.compose.cfr.CFRPopupProperties
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.settings.SupportUtils
 import org.mozilla.fenix.settings.SupportUtils.SumoTopic.TOTAL_COOKIE_PROTECTION
+import org.mozilla.fenix.settings.quicksettings.protections.cookiebanners.dialog.CookieBannerReEngagementDialogUtils
 import org.mozilla.fenix.theme.FirefoxTheme
 import org.mozilla.fenix.utils.Settings
 
@@ -111,6 +114,7 @@ class BrowserToolbarCFRPresenter(
                     true -> TrackingProtection.tcpCfrExplicitDismissal.record(NoExtras())
                     false -> TrackingProtection.tcpCfrImplicitDismissal.record(NoExtras())
                 }
+                tryToShowCookieBannerDialogIfNeeded()
             },
         ) {
             Text(
@@ -137,4 +141,15 @@ class BrowserToolbarCFRPresenter(
             TrackingProtection.tcpCfrShown.record(NoExtras())
         }
     }
+
+    @VisibleForTesting
+    internal fun tryToShowCookieBannerDialogIfNeeded() {
+        browserStore.state.selectedTab?.let { tab ->
+            CookieBannerReEngagementDialogUtils.tryToShowReEngagementDialog(
+                settings = settings,
+                status = tab.cookieBanner,
+                navController = toolbar.findNavController(),
+            )
+        }
+    }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/compose/Divider.kt b/app/src/main/java/org/mozilla/fenix/compose/Divider.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.compose
 
-import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -16,8 +15,8 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
 import org.mozilla.fenix.theme.FirefoxTheme
 
 /**
@@ -39,8 +38,7 @@ fun Divider(
  * An example of a vertical divider.
  */
 @Composable
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@LightDarkPreview
 private fun VerticalDividerPreview() {
     FirefoxTheme {
         Box(
@@ -74,8 +72,7 @@ private fun VerticalDividerPreview() {
  * An example of divider usage in a list menu.
  */
 @Composable
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@LightDarkPreview
 private fun HorizontalDividerPreview() {
     FirefoxTheme {
         Box(

diff --git a/app/src/main/java/org/mozilla/fenix/compose/ListItemTabLarge.kt b/app/src/main/java/org/mozilla/fenix/compose/ListItemTabLarge.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.compose
 
-import android.content.res.Configuration
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -22,9 +21,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
 import org.mozilla.fenix.theme.FirefoxTheme
 
 /**
@@ -167,8 +166,7 @@ fun ListItemTabSurface(
 }
 
 @Composable
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@LightDarkPreview
 private fun ListItemTabLargePreview() {
     FirefoxTheme {
         ListItemTabLarge(
@@ -180,8 +178,7 @@ private fun ListItemTabLargePreview() {
 }
 
 @Composable
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@LightDarkPreview
 private fun ListItemTabSurfacePreview() {
     FirefoxTheme {
         ListItemTabSurface(
@@ -197,8 +194,7 @@ private fun ListItemTabSurfacePreview() {
 }
 
 @Composable
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@LightDarkPreview
 private fun ListItemTabSurfaceWithCustomBackgroundPreview() {
     FirefoxTheme {
         ListItemTabSurface(

diff --git a/app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt b/app/src/main/java/org/mozilla/fenix/compose/MessageCard.kt
@@ -4,7 +4,6 @@
 
 package org.mozilla.fenix.compose
 
-import android.content.res.Configuration
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -26,10 +25,10 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.mozilla.fenix.R
+import org.mozilla.fenix.compose.annotation.LightDarkPreview
 import org.mozilla.fenix.compose.button.PrimaryButton
 import org.mozilla.fenix.theme.FirefoxTheme
 
@@ -199,8 +198,7 @@ data class MessageCardColors(
 }
 
 @Composable
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@LightDarkPreview
 private fun MessageCardPreview() {
     FirefoxTheme {
         Box(
@@ -219,8 +217,7 @@ private fun MessageCardPreview() {
 }
 
 @Composable
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@LightDarkPreview
 private fun MessageCardWithoutTitlePreview() {
     FirefoxTheme {
         Box(
@@ -238,8 +235,7 @@ private fun MessageCardWithoutTitlePreview() {
 }
 
 @Composable
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_YES)
-@Preview(uiMode = Configuration.UI_MODE_NIGHT_NO)
+@LightDarkPreview
 private fun MessageCardWithButtonLabelPreview() {
     FirefoxTheme {
         Box(