Skip to content

Commit 42b4545

Browse files
authored
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
1 parent 1063f48 commit 42b4545

File tree

8 files changed

+13
-12
lines changed

8 files changed

+13
-12
lines changed

app/src/main/java/com/duckduckgo/app/brokensite/BrokenSiteViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import com.duckduckgo.brokensite.api.ReportFlow as BrokenSiteModelReportFlow
3838
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow
3939
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.DASHBOARD
4040
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.MENU
41-
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.PROMPT
41+
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
4242
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.TOGGLE_DASHBOARD
4343
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.TOGGLE_MENU
4444
import com.duckduckgo.browser.api.brokensite.BrokenSiteOpenerContext
@@ -288,7 +288,7 @@ private fun MutableLiveData<ViewState>.setProtectionsState(state: SiteProtection
288288
private fun ReportFlow.mapToBrokenSiteModelReportFlow(): BrokenSiteModelReportFlow = when (this) {
289289
MENU -> BrokenSiteModelReportFlow.MENU
290290
DASHBOARD -> BrokenSiteModelReportFlow.DASHBOARD
291-
PROMPT -> BrokenSiteModelReportFlow.PROMPT
291+
RELOAD_THREE_TIMES_WITHIN_20_SECONDS -> BrokenSiteModelReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
292292
TOGGLE_MENU -> BrokenSiteModelReportFlow.TOGGLE_MENU
293293
TOGGLE_DASHBOARD -> BrokenSiteModelReportFlow.TOGGLE_DASHBOARD
294294
}

app/src/main/java/com/duckduckgo/app/brokensite/api/BrokenSiteSender.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import com.duckduckgo.brokensite.api.BrokenSiteSender
3232
import com.duckduckgo.brokensite.api.ReportFlow
3333
import com.duckduckgo.brokensite.api.ReportFlow.DASHBOARD
3434
import com.duckduckgo.brokensite.api.ReportFlow.MENU
35-
import com.duckduckgo.brokensite.api.ReportFlow.PROMPT
35+
import com.duckduckgo.brokensite.api.ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
3636
import com.duckduckgo.brokensite.api.ReportFlow.TOGGLE_DASHBOARD
3737
import com.duckduckgo.brokensite.api.ReportFlow.TOGGLE_MENU
3838
import com.duckduckgo.browser.api.WebViewVersionProvider
@@ -231,7 +231,7 @@ class BrokenSiteSubmitter @Inject constructor(
231231
private fun ReportFlow.toStringValue(): String = when (this) {
232232
DASHBOARD -> "dashboard"
233233
MENU -> "menu"
234-
PROMPT -> "prompt"
235234
TOGGLE_DASHBOARD -> "on_protections_off_dashboard_main"
236235
TOGGLE_MENU -> "on_protections_off_menu"
236+
RELOAD_THREE_TIMES_WITHIN_20_SECONDS -> "reload-three-times-within-20-seconds"
237237
}

app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ import com.duckduckgo.autofill.api.domain.app.LoginTriggerType
225225
import com.duckduckgo.autofill.api.emailprotection.EmailInjector
226226
import com.duckduckgo.browser.api.WebViewVersionProvider
227227
import com.duckduckgo.browser.api.brokensite.BrokenSiteData
228-
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.PROMPT
228+
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
229229
import com.duckduckgo.common.ui.DuckDuckGoFragment
230230
import com.duckduckgo.common.ui.store.BrowserAppTheme
231231
import com.duckduckgo.common.ui.view.DaxDialog
@@ -1921,7 +1921,7 @@ class BrowserTabFragment :
19211921

19221922
if (webBrokenSiteForm.shouldUseWebBrokenSiteForm()) {
19231923
val reportFlow = when (data.reportFlow) {
1924-
PROMPT -> BrokenSiteFormReportFlow.PROMPT
1924+
RELOAD_THREE_TIMES_WITHIN_20_SECONDS -> BrokenSiteFormReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
19251925
else -> BrokenSiteFormReportFlow.MENU
19261926
}
19271927
globalActivityStarter.startIntent(context, BrokenSiteForm(tabId = tabId, reportFlow = reportFlow))

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ import com.duckduckgo.brokensite.api.BrokenSitePrompt
260260
import com.duckduckgo.browser.api.UserBrowserProperties
261261
import com.duckduckgo.browser.api.brokensite.BrokenSiteData
262262
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.MENU
263-
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.PROMPT
263+
import com.duckduckgo.browser.api.brokensite.BrokenSiteData.ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
264264
import com.duckduckgo.common.utils.AppUrl
265265
import com.duckduckgo.common.utils.ConflatedJob
266266
import com.duckduckgo.common.utils.DispatcherProvider
@@ -3484,7 +3484,7 @@ class BrowserTabViewModel @Inject constructor(
34843484

34853485
private fun onBrokenSiteCtaOkButtonClicked(cta: BrokenSitePromptDialogCta): Command? {
34863486
viewModelScope.launch {
3487-
command.value = BrokenSiteFeedback(BrokenSiteData.fromSite(site, reportFlow = PROMPT))
3487+
command.value = BrokenSiteFeedback(BrokenSiteData.fromSite(site, reportFlow = RELOAD_THREE_TIMES_WITHIN_20_SECONDS))
34883488
command.value = HideBrokenSitePromptCta(cta)
34893489
}
34903490
return null

broken-site/broken-site-api/src/main/java/com/duckduckgo/brokensite/api/BrokenSiteSender.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ data class BrokenSite(
4141
val jsPerformance: List<Double>?,
4242
)
4343

44-
enum class ReportFlow { DASHBOARD, MENU, PROMPT, TOGGLE_DASHBOARD, TOGGLE_MENU }
44+
enum class ReportFlow { DASHBOARD, MENU, TOGGLE_DASHBOARD, TOGGLE_MENU, RELOAD_THREE_TIMES_WITHIN_20_SECONDS }

browser-api/src/main/java/com/duckduckgo/browser/api/brokensite/BrokenSiteNav.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ data class BrokenSiteData(
4444
val openerContext: BrokenSiteOpenerContext?,
4545
val jsPerformance: DoubleArray?,
4646
) {
47-
enum class ReportFlow { MENU, DASHBOARD, PROMPT, TOGGLE_DASHBOARD, TOGGLE_MENU }
47+
enum class ReportFlow { MENU, DASHBOARD, TOGGLE_DASHBOARD, TOGGLE_MENU, RELOAD_THREE_TIMES_WITHIN_20_SECONDS }
4848

4949
companion object {
5050
fun fromSite(site: Site?, reportFlow: ReportFlow): BrokenSiteData {

privacy-dashboard/privacy-dashboard-api/src/main/java/com/duckduckgo/privacy/dashboard/api/ui/PrivacyDashboardHybridScreenParams.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ sealed class PrivacyDashboardHybridScreenParams : GlobalActivityStarter.Activity
5050
) : PrivacyDashboardHybridScreenParams() {
5151
enum class BrokenSiteFormReportFlow {
5252
MENU,
53-
PROMPT,
53+
RELOAD_THREE_TIMES_WITHIN_20_SECONDS,
5454
}
5555
}
5656

privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/PrivacyDashboardHybridActivity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ class PrivacyDashboardHybridActivity : DuckDuckGoActivity() {
109109
is BrokenSiteForm -> {
110110
when (params.reportFlow) {
111111
BrokenSiteForm.BrokenSiteFormReportFlow.MENU -> ReportFlow.MENU
112-
BrokenSiteForm.BrokenSiteFormReportFlow.PROMPT -> ReportFlow.PROMPT
112+
BrokenSiteForm.BrokenSiteFormReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS ->
113+
ReportFlow.RELOAD_THREE_TIMES_WITHIN_20_SECONDS
113114
}
114115
}
115116
else -> ReportFlow.DASHBOARD

0 commit comments

Comments
 (0)