Rename report flow param from prompt to reload-three-times-within-20-…

…seconds (#5339) Task/Issue URL: https://app.asana.com/0/0/1208889990660025/f ### Description Align reportFlow value with the spec. reportFlow -> reload-three-times-within-20-seconds ### Steps to test this PR n/a ### UI changes n/a
duckduckgo · Dec 10, 2024 · 42b4545 · 42b4545
1 parent 1063f48
commit 42b4545
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 deletions.
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt b/app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt
@@ -38,7 +38,7 @@ import com.duckduckgo.brokensite.api.ReportFlow as BrokenSiteModelReportFlow
 import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow
 import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.DASHBOARD
 import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.MENU
-import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.PROMPT
+import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
 import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.TOGGLE_DASHBOARD
 import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.TOGGLE_MENU
 import com.duckduckgo.browser.api.brokensite.BrokenSiteOpenerContext
@@ -288,7 +288,7 @@ private fun MutableLiveData<ViewState>.setProtectionsState(state: SiteProtection
 private fun ReportFlow.mapToBrokenSiteModelReportFlow(): BrokenSiteModelReportFlow = when (this) {
     MENU -> BrokenSiteModelReportFlow.MENU
     DASHBOARD -> BrokenSiteModelReportFlow.DASHBOARD
-    PROMPT -> BrokenSiteModelReportFlow.PROMPT
+    RELOAD_THREE_TIMES_WITHIN_20_SECONDS -> BrokenSiteModelReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
     TOGGLE_MENU -> BrokenSiteModelReportFlow.TOGGLE_MENU
     TOGGLE_DASHBOARD -> BrokenSiteModelReportFlow.TOGGLE_DASHBOARD
 }
diff --git a/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt b/app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt
@@ -32,7 +32,7 @@ import com.duckduckgo.brokensite.api.BrokenSiteSender
 import com.duckduckgo.brokensite.api.ReportFlow
 import com.duckduckgo.brokensite.api.ReportFlow.DASHBOARD
 import com.duckduckgo.brokensite.api.ReportFlow.MENU
-import com.duckduckgo.brokensite.api.ReportFlow.PROMPT
+import com.duckduckgo.brokensite.api.ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
 import com.duckduckgo.brokensite.api.ReportFlow.TOGGLE_DASHBOARD
 import com.duckduckgo.brokensite.api.ReportFlow.TOGGLE_MENU
 import com.duckduckgo.browser.api.WebViewVersionProvider
@@ -231,7 +231,7 @@ class BrokenSiteSubmitter @Inject constructor(
 private fun ReportFlow.toStringValue(): String = when (this) {
     DASHBOARD -> "dashboard"
     MENU -> "menu"
-    PROMPT -> "prompt"
     TOGGLE_DASHBOARD -> "on_protections_off_dashboard_main"
     TOGGLE_MENU -> "on_protections_off_menu"
+    RELOAD_THREE_TIMES_WITHIN_20_SECONDS -> "reload-three-times-within-20-seconds"
 }
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,7 +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.browser.api.brokensite.BrokenSiteData.ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
 import com.duckduckgo.common.ui.DuckDuckGoFragment
 import com.duckduckgo.common.ui.store.BrowserAppTheme
 import com.duckduckgo.common.ui.view.DaxDialog
@@ -1921,7 +1921,7 @@ class BrowserTabFragment :
 
         if (webBrokenSiteForm.shouldUseWebBrokenSiteForm()) {
             val reportFlow = when (data.reportFlow) {
-                PROMPT -> BrokenSiteFormReportFlow.PROMPT
+                RELOAD_THREE_TIMES_WITHIN_20_SECONDS -> BrokenSiteFormReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
                 else -> BrokenSiteFormReportFlow.MENU
             }
             globalActivityStarter.startIntent(context, BrokenSiteForm(tabId = tabId, reportFlow = reportFlow))

diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt
@@ -260,7 +260,7 @@ import com.duckduckgo.brokensite.api.BrokenSitePrompt
 import com.duckduckgo.browser.api.UserBrowserProperties
 import com.duckduckgo.browser.api.brokensite.BrokenSiteData
 import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.MENU
-import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.PROMPT
+import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
 import com.duckduckgo.common.utils.AppUrl
 import com.duckduckgo.common.utils.ConflatedJob
 import com.duckduckgo.common.utils.DispatcherProvider
@@ -3484,7 +3484,7 @@ class BrowserTabViewModel @Inject constructor(
 
     private fun onBrokenSiteCtaOkButtonClicked(cta: BrokenSitePromptDialogCta): Command? {
         viewModelScope.launch {
-            command.value = BrokenSiteFeedback(BrokenSiteData.fromSite(site, reportFlow = PROMPT))
+            command.value = BrokenSiteFeedback(BrokenSiteData.fromSite(site, reportFlow = RELOAD_THREE_TIMES_WITHIN_20_SECONDS))
             command.value = HideBrokenSitePromptCta(cta)
         }
         return null

diff --git a/broken-site/broken-site-api/src/main/java/com/duckduckgo/brokensite/api/BrokenSiteSender.kt b/broken-site/broken-site-api/src/main/java/com/duckduckgo/brokensite/api/BrokenSiteSender.kt
@@ -41,4 +41,4 @@ data class BrokenSite(
     val jsPerformance: List<Double>?,
 )
 
-enum class ReportFlow { DASHBOARD, MENU, PROMPT, TOGGLE_DASHBOARD, TOGGLE_MENU }
+enum class ReportFlow { DASHBOARD, MENU, TOGGLE_DASHBOARD, TOGGLE_MENU, RELOAD_THREE_TIMES_WITHIN_20_SECONDS }
diff --git a/browser-api/src/main/java/com/duckduckgo/browser/api/brokensite/BrokenSiteNav.kt b/browser-api/src/main/java/com/duckduckgo/browser/api/brokensite/BrokenSiteNav.kt
@@ -44,7 +44,7 @@ data class BrokenSiteData(
     val openerContext: BrokenSiteOpenerContext?,
     val jsPerformance: DoubleArray?,
 ) {
-    enum class ReportFlow { MENU, DASHBOARD, PROMPT, TOGGLE_DASHBOARD, TOGGLE_MENU }
+    enum class ReportFlow { MENU, DASHBOARD, TOGGLE_DASHBOARD, TOGGLE_MENU, RELOAD_THREE_TIMES_WITHIN_20_SECONDS }
 
     companion object {
         fun fromSite(site: Site?, reportFlow: ReportFlow): BrokenSiteData {

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
@@ -50,7 +50,7 @@ sealed class PrivacyDashboardHybridScreenParams : GlobalActivityStarter.Activity
     ) : PrivacyDashboardHybridScreenParams() {
         enum class BrokenSiteFormReportFlow {
             MENU,
-            PROMPT,
+            RELOAD_THREE_TIMES_WITHIN_20_SECONDS,
         }
     }
 

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
@@ -109,7 +109,8 @@ class PrivacyDashboardHybridActivity : DuckDuckGoActivity() {
                         is BrokenSiteForm -> {
                             when (params.reportFlow) {
                                 BrokenSiteForm.BrokenSiteFormReportFlow.MENU -> ReportFlow.MENU
-                                BrokenSiteForm.BrokenSiteFormReportFlow.PROMPT -> ReportFlow.PROMPT
+                                BrokenSiteForm.BrokenSiteFormReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS ->
+                                    ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
                             }
                         }
                         else -> ReportFlow.DASHBOARD
-Original file line number
+Diff line change
@@ Expand Up @@
         ) : PrivacyDashboardHybridScreenParams() {
             enum class BrokenSiteFormReportFlow {
                 MENU,
-                PROMPT,
+                RELOAD_THREE_TIMES_WITHIN_20_SECONDS,
             }
         }
@@ Expand Down @@