Set report flow to form when launchiung hybrid site from the prompt

duckduckgo · Nov 27, 2024 · e95a1cd · e95a1cd
1 parent d81c9a7
commit e95a1cd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -225,6 +225,7 @@ import com.duckduckgo.autofill.api.domain.app.LoginTriggerType
 import com.duckduckgo.autofill.api.emailprotection.EmailInjector
 import com.duckduckgo.browser.api.WebViewVersionProvider
 import com.duckduckgo.browser.api.brokensite.BrokenSiteData
+import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.PROMPT
 import com.duckduckgo.common.ui.DuckDuckGoFragment
 import com.duckduckgo.common.ui.store.BrowserAppTheme
 import com.duckduckgo.common.ui.view.DaxDialog
@@ -272,6 +273,7 @@ import com.duckduckgo.navigation.api.GlobalActivityStarter
 import com.duckduckgo.navigation.api.GlobalActivityStarter.DeeplinkActivityParams
 import com.duckduckgo.privacy.dashboard.api.ui.PrivacyDashboardHybridScreenParams
 import com.duckduckgo.privacy.dashboard.api.ui.PrivacyDashboardHybridScreenParams.BrokenSiteForm
+import com.duckduckgo.privacy.dashboard.api.ui.PrivacyDashboardHybridScreenParams.BrokenSiteForm.BrokenSiteFormReportFlow
 import com.duckduckgo.privacy.dashboard.api.ui.WebBrokenSiteForm
 import com.duckduckgo.privacyprotectionspopup.api.PrivacyProtectionsPopup
 import com.duckduckgo.privacyprotectionspopup.api.PrivacyProtectionsPopupFactory
@@ -1906,7 +1908,11 @@ class BrowserTabFragment :
         val context = context ?: return
 
         if (webBrokenSiteForm.shouldUseWebBrokenSiteForm()) {
-            globalActivityStarter.startIntent(context, BrokenSiteForm(tabId))
+            val reportFlow = when (data.reportFlow) {
+                PROMPT -> BrokenSiteFormReportFlow.PROMPT
+                else -> BrokenSiteFormReportFlow.MENU
+            }
+            globalActivityStarter.startIntent(context, BrokenSiteForm(tabId, reportFlow))
                 ?.let { startActivity(it) }
         } else {
             val options = ActivityOptions.makeSceneTransitionAnimation(browserActivity).toBundle()

diff --git a/...c/main/java/com/duckduckgo/privacy/dashboard/api/ui/PrivacyDashboardHybridScreenParams.kt b/...c/main/java/com/duckduckgo/privacy/dashboard/api/ui/PrivacyDashboardHybridScreenParams.kt
@@ -32,5 +32,10 @@ sealed class PrivacyDashboardHybridScreenParams : GlobalActivityStarter.Activity
      * Use this parameter to launch the site breakage reporting form.
      * @param tabId The tab ID
      */
-    data class BrokenSiteForm(override val tabId: String) : PrivacyDashboardHybridScreenParams()
+    data class BrokenSiteForm(override val tabId: String, val reportFlow: BrokenSiteFormReportFlow) : PrivacyDashboardHybridScreenParams() {
+        enum class BrokenSiteFormReportFlow {
+            MENU,
+            PROMPT,
+        }
+    }
 }
diff --git a/.../src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/PrivacyDashboardHybridActivity.kt b/.../src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/PrivacyDashboardHybridActivity.kt
@@ -96,7 +96,7 @@ class PrivacyDashboardHybridActivity : DuckDuckGoActivity() {
                 onSubmitBrokenSiteReport = { payload ->
                     val reportFlow = when (params) {
                         is PrivacyDashboardPrimaryScreen, null -> ReportFlow.DASHBOARD
-                        is BrokenSiteForm -> ReportFlow.MENU
+                        is BrokenSiteForm -> if ((params as BrokenSiteForm).reportFlow == BrokenSiteForm.BrokenSiteFormReportFlow.MENU) ReportFlow.MENU else ReportFlow.PROMPT
                     }
                     viewModel.onSubmitBrokenSiteReport(payload, reportFlow)
                 },