From 3c261a98f513744e049d9597525ccd023fbabb11 Mon Sep 17 00:00:00 2001
From: Alexandru2909 <aputanu@mozilla.com>
Date: Thu, 23 Feb 2023 15:19:03 +0200
Subject: [PATCH] Bug 1818015 - Use custom tab to show privacy notice during
 onboarding

(cherry picked from commit 8661a63a378da6c76fede176824e8c8655d9d560)
---
 .../org/mozilla/fenix/ui/OnboardingTest.kt    |  2 ++
 .../SessionControlController.kt               |  9 +++++----
 .../DefaultSessionControlControllerTest.kt    | 19 +++++++++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/OnboardingTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/OnboardingTest.kt
index 8a797d744..2468e8629 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/OnboardingTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/OnboardingTest.kt
@@ -6,6 +6,7 @@ import androidx.test.uiautomator.UiDevice
 import okhttp3.mockwebserver.MockWebServer
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.mozilla.fenix.customannotations.SmokeTest
@@ -211,6 +212,7 @@ class OnboardingTest {
     }
 
     @Test
+    @Ignore("Failing due to changes from https://github.com/mozilla-mobile/firefox-android/pull/969")
     fun youControlYourDataCardTest() {
         homeScreen {
             verifyPrivacyNoticeCard()
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
index 5f9b12aef..46f5453f2 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt
@@ -516,10 +516,11 @@ class DefaultSessionControlController(
     }
 
     override fun handleReadPrivacyNoticeClicked() {
-        activity.openToBrowserAndLoad(
-            searchTermOrURL = SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
-            newTab = true,
-            from = BrowserDirection.FromHome,
+        activity.startActivity(
+            SupportUtils.createCustomTabIntent(
+                activity,
+                SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
+            ),
         )
     }
 
diff --git a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
index f1a67e16f..080706c35 100644
--- a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt
@@ -11,8 +11,11 @@ import io.mockk.Runs
 import io.mockk.every
 import io.mockk.just
 import io.mockk.mockk
+import io.mockk.mockkObject
 import io.mockk.mockkStatic
+import io.mockk.slot
 import io.mockk.spyk
+import io.mockk.unmockkObject
 import io.mockk.unmockkStatic
 import io.mockk.verify
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -963,14 +966,22 @@ class DefaultSessionControlControllerTest {
 
     @Test
     fun handleReadPrivacyNoticeClicked() {
+        mockkObject(SupportUtils)
+        val urlCaptor = slot<String>()
+        every { SupportUtils.createCustomTabIntent(any(), capture(urlCaptor)) } returns mockk()
+
         createController().handleReadPrivacyNoticeClicked()
+
         verify {
-            activity.openToBrowserAndLoad(
-                searchTermOrURL = SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
-                newTab = true,
-                from = BrowserDirection.FromHome,
+            activity.startActivity(
+                any(),
             )
         }
+        assertEquals(
+            SupportUtils.getMozillaPageUrl(SupportUtils.MozillaPage.PRIVATE_NOTICE),
+            urlCaptor.captured,
+        )
+        unmockkObject(SupportUtils)
     }
 
     @Test