From 65db3a4ac95cf9e8b1cac5a03f9505116a6cd0b5 Mon Sep 17 00:00:00 2001
From: t-p-white <t-p-white>
Date: Fri, 31 Mar 2023 11:04:11 +0100
Subject: [PATCH] Bug 1825020 - Update the SET_AS_DEFAULT_BROWSER breadcrumb
 and use getGenericSumoURLForTopic for Android <= M

---
 .../fenix/app/src/main/java/org/mozilla/fenix/ext/Activity.kt        | 3 +--
 .../app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt     | 2 +-
 .../org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessorTest.kt | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Activity.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Activity.kt
index 07d34092435c..6562b3162827 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Activity.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/ext/Activity.kt
@@ -96,8 +96,7 @@ fun Activity.openSetDefaultBrowserOption(
             navigateToDefaultBrowserAppsSettings()
         }
         else -> {
-            val sumoDefaultBrowserUrl = SupportUtils.getSumoURLForTopic(
-                context = this,
+            val sumoDefaultBrowserUrl = SupportUtils.getGenericSumoURLForTopic(
                 topic = SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER,
             )
             if (useCustomTab) {
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
index 84363aa7986f..cc613c49a623 100644
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -47,7 +47,7 @@ object SupportUtils {
         WHATS_NEW("whats-new-firefox-preview"),
         OPT_OUT_STUDIES("how-opt-out-studies-firefox-android"),
         SEND_TABS("send-tab-preview"),
-        SET_AS_DEFAULT_BROWSER("set-firefox-preview-default"),
+        SET_AS_DEFAULT_BROWSER("make-firefox-default-browser-android"),
         SEARCH_SUGGESTION("how-search-firefox-preview"),
         CUSTOM_SEARCH_ENGINES("custom-search-engines"),
         SYNC_SETUP("how-set-firefox-sync-firefox-android"),
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessorTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessorTest.kt
index 573296b9b396..3387a8ea24b8 100644
--- a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessorTest.kt
+++ b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessorTest.kt
@@ -262,9 +262,8 @@ class HomeDeepLinkIntentProcessorTest {
 
         assertTrue(processorHome.process(testIntent("make_default_browser"), navController, out))
 
-        val searchTermOrURL = SupportUtils.getSumoURLForTopic(
-            activity,
-            SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER,
+        val searchTermOrURL = SupportUtils.getGenericSumoURLForTopic(
+            topic = SupportUtils.SumoTopic.SET_AS_DEFAULT_BROWSER,
         )
 
         verify {
-- 
2.11.4.GIT