Skip to content

Commit e95a1cd

Browse files
committed
Set report flow to form when launchiung hybrid site from the prompt
1 parent d81c9a7 commit e95a1cd

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,6 +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
228229
import com.duckduckgo.common.ui.DuckDuckGoFragment
229230
import com.duckduckgo.common.ui.store.BrowserAppTheme
230231
import com.duckduckgo.common.ui.view.DaxDialog
@@ -272,6 +273,7 @@ import com.duckduckgo.navigation.api.GlobalActivityStarter
272273
import com.duckduckgo.navigation.api.GlobalActivityStarter.DeeplinkActivityParams
273274
import com.duckduckgo.privacy.dashboard.api.ui.PrivacyDashboardHybridScreenParams
274275
import com.duckduckgo.privacy.dashboard.api.ui.PrivacyDashboardHybridScreenParams.BrokenSiteForm
276+
import com.duckduckgo.privacy.dashboard.api.ui.PrivacyDashboardHybridScreenParams.BrokenSiteForm.BrokenSiteFormReportFlow
275277
import com.duckduckgo.privacy.dashboard.api.ui.WebBrokenSiteForm
276278
import com.duckduckgo.privacyprotectionspopup.api.PrivacyProtectionsPopup
277279
import com.duckduckgo.privacyprotectionspopup.api.PrivacyProtectionsPopupFactory
@@ -1906,7 +1908,11 @@ class BrowserTabFragment :
19061908
val context = context ?: return
19071909

19081910
if (webBrokenSiteForm.shouldUseWebBrokenSiteForm()) {
1909-
globalActivityStarter.startIntent(context, BrokenSiteForm(tabId))
1911+
val reportFlow = when (data.reportFlow) {
1912+
PROMPT -> BrokenSiteFormReportFlow.PROMPT
1913+
else -> BrokenSiteFormReportFlow.MENU
1914+
}
1915+
globalActivityStarter.startIntent(context, BrokenSiteForm(tabId, reportFlow))
19101916
?.let { startActivity(it) }
19111917
} else {
19121918
val options = ActivityOptions.makeSceneTransitionAnimation(browserActivity).toBundle()

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,10 @@ sealed class PrivacyDashboardHybridScreenParams : GlobalActivityStarter.Activity
3232
* Use this parameter to launch the site breakage reporting form.
3333
* @param tabId The tab ID
3434
*/
35-
data class BrokenSiteForm(override val tabId: String) : PrivacyDashboardHybridScreenParams()
35+
data class BrokenSiteForm(override val tabId: String, val reportFlow: BrokenSiteFormReportFlow) : PrivacyDashboardHybridScreenParams() {
36+
enum class BrokenSiteFormReportFlow {
37+
MENU,
38+
PROMPT,
39+
}
40+
}
3641
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class PrivacyDashboardHybridActivity : DuckDuckGoActivity() {
9696
onSubmitBrokenSiteReport = { payload ->
9797
val reportFlow = when (params) {
9898
is PrivacyDashboardPrimaryScreen, null -> ReportFlow.DASHBOARD
99-
is BrokenSiteForm -> ReportFlow.MENU
99+
is BrokenSiteForm -> if ((params as BrokenSiteForm).reportFlow == BrokenSiteForm.BrokenSiteFormReportFlow.MENU) ReportFlow.MENU else ReportFlow.PROMPT
100100
}
101101
viewModel.onSubmitBrokenSiteReport(payload, reportFlow)
102102
},

0 commit comments

Comments
 (0)