Address PR comments

CrisBarreiro · CrisBarreiro · commit 46aa3e342c2c · 2024-11-28T15:41:42.000+01:00
diff --git a/privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/PrivacyDashboardHybridActivity.kt b/privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/PrivacyDashboardHybridActivity.kt
@@ -94,13 +94,13 @@ class PrivacyDashboardHybridActivity : DuckDuckGoActivity() {
                 onBrokenSiteClicked = { viewModel.onReportBrokenSiteSelected() },
                 onClose = { this@PrivacyDashboardHybridActivity.finish() },
                 onSubmitBrokenSiteReport = { payload ->
-                    val reportFlow = when (params) {
+                    val reportFlow = when (val params = params) {
                         is PrivacyDashboardPrimaryScreen, null -> ReportFlow.DASHBOARD
                         is BrokenSiteForm -> {
-                            if ((params as BrokenSiteForm).reportFlow == BrokenSiteForm.BrokenSiteFormReportFlow.MENU) {
-                                ReportFlow.MENU
-                            } else {
-                                ReportFlow.PROMPT
+                            when (params.reportFlow) {
+                                BrokenSiteForm.BrokenSiteFormReportFlow.MENU -> ReportFlow.MENU
+                                BrokenSiteForm.BrokenSiteFormReportFlow.PROMPT -> ReportFlow.PROMPT
+                                else -> null
                             }
                         }
                     }
diff --git a/privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/PrivacyDashboardHybridViewModel.kt b/privacy-dashboard/privacy-dashboard-impl/src/main/java/com/duckduckgo/privacy/dashboard/impl/ui/PrivacyDashboardHybridViewModel.kt
@@ -404,7 +404,7 @@ class PrivacyDashboardHybridViewModel @Inject constructor(
         }
     }
 
-    fun onSubmitBrokenSiteReport(payload: String, reportFlow: ReportFlow) {
+    fun onSubmitBrokenSiteReport(payload: String, reportFlow: ReportFlow?) {
         viewModelScope.launch(dispatcher.io()) {
             if (!webBrokenSiteFormFeature.isEnabled()) return@launch
             val request = privacyDashboardPayloadAdapter.onSubmitBrokenSiteReport(payload) ?: return@launch

Original file line number	Diff line number	Diff line change
`@@ -94,13 +94,13 @@ class PrivacyDashboardHybridActivity : DuckDuckGoActivity() {`
`94`	`94`	`onBrokenSiteClicked = { viewModel.onReportBrokenSiteSelected() },`
`95`	`95`	`onClose = { this@PrivacyDashboardHybridActivity.finish() },`
`96`	`96`	`onSubmitBrokenSiteReport = { payload ->`
`97`		`- val reportFlow = when (params) {`
	`97`	`+ val reportFlow = when (val params = params) {`
`98`	`98`	`is PrivacyDashboardPrimaryScreen, null -> ReportFlow.DASHBOARD`
`99`	`99`	`is BrokenSiteForm -> {`
`100`		`- if ((params as BrokenSiteForm).reportFlow == BrokenSiteForm.BrokenSiteFormReportFlow.MENU) {`
`101`		`- ReportFlow.MENU`
`102`		`- } else {`
`103`		`- ReportFlow.PROMPT`
	`100`	`+ when (params.reportFlow) {`
	`101`	`+ BrokenSiteForm.BrokenSiteFormReportFlow.MENU -> ReportFlow.MENU`
	`102`	`+ BrokenSiteForm.BrokenSiteFormReportFlow.PROMPT -> ReportFlow.PROMPT`
	`103`	`+ else -> null`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ class PrivacyDashboardHybridViewModel @Inject constructor(`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`
`407`		`- fun onSubmitBrokenSiteReport(payload: String, reportFlow: ReportFlow) {`
	`407`	`+ fun onSubmitBrokenSiteReport(payload: String, reportFlow: ReportFlow?) {`
`408`	`408`	`viewModelScope.launch(dispatcher.io()) {`
`409`	`409`	`if (!webBrokenSiteFormFeature.isEnabled()) return@launch`
`410`	`410`	`val request = privacyDashboardPayloadAdapter.onSubmitBrokenSiteReport(payload) ?: return@launch`