Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Nov 28, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d8bdb6c
Set report flow to form when launchiung hybrid site from the prompt
CrisBarreiro Nov 27, 2024
301c7fc
Rename pixels according to the spec
CrisBarreiro Nov 27, 2024
29e8164
Address PR comments
CrisBarreiro Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/duckduckgo/app/pixels/AppPixelName.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,10 +363,10 @@ enum class AppPixelName(override val pixelName: String) : Pixel.PixelName {

REFRESH_ACTION_DAILY_PIXEL("m_refresh_action_daily"),
RELOAD_TWICE_WITHIN_12_SECONDS("m_reload_twice_within_12_seconds"),
RELOAD_THREE_TIMES_WITHIN_20_SECONDS("m_reload_three_times_within_20_seconds"),
RELOAD_THREE_TIMES_WITHIN_20_SECONDS("m_reload-three-times-within-20-seconds"),

SITE_NOT_WORKING_WEBSITE_BROKEN("site_not_working_website_is_broken"),
SITE_NOT_WORKING_SHOWN("site_not_working_shown"),
SITE_NOT_WORKING_WEBSITE_BROKEN("m_site-not-working_website-is-broken"),
SITE_NOT_WORKING_SHOWN("m_site-not-working_shown"),

URI_LOADED("m_uri_loaded"),

Expand Down
7 changes: 6 additions & 1 deletion ...c/main/java/com/duckduckgo/privacy/dashboard/api/ui/PrivacyDashboardHybridScreenParams.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
}
}
9 changes: 7 additions & 2 deletions .../src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/PrivacyDashboardHybridActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,14 @@ class PrivacyDashboardHybridActivity : DuckDuckGoActivity() {
onBrokenSiteClicked = { viewModel.onReportBrokenSiteSelected() },
onClose = { [email protected]() },
onSubmitBrokenSiteReport = { payload ->
val reportFlow = when (params) {
val reportFlow = when (val params = params) {
is PrivacyDashboardPrimaryScreen, null -> ReportFlow.DASHBOARD
is BrokenSiteForm -> ReportFlow.MENU
is BrokenSiteForm -> {
when (params.reportFlow) {
BrokenSiteForm.BrokenSiteFormReportFlow.MENU -> ReportFlow.MENU
BrokenSiteForm.BrokenSiteFormReportFlow.PROMPT -> ReportFlow.PROMPT
}
}
}
viewModel.onSubmitBrokenSiteReport(payload, reportFlow)
},
Expand Down
Loading