Fire Dialog: New data clearing component #7351

0nko · 2025-12-14T13:00:56Z

Task/Issue URL: https://app.asana.com/1/137249556945/project/1207418217763355/task/1212373034728504?focus=true

Description

This PR adds a new AutomaticDataClearing and ManualDataClearing interface, which encapsulate the manual and automatic data-clearing functionality and the necessary side-effects.

Steps to test this PR

Unit tests

Make sure all unit tests pass

Exisitng manual fire functionality

Perform manual fire action
Verify that tabs and data are cleared, as expected

Exisitng automatic fire functionality

Schedule automatic data-clearing (tabs only) set for app launch
Restart the app and check that tabs are cleared, as expected
Schedule automatic data-clearing (tabs and data) set for app launch
Verify that tabs and data are cleared, as expected

Duck.ai chats fire functionality

Go to Settings -> Data Clearing -> Enable Clear Duck.ai chats
Perform manual fire action for Data, tabs and chats
Verify that tabs, data and chats are cleared, as expected

Note

Introduces granular manual/automatic data-clearing (tabs, data, Duck.ai chats) behind a feature flag, refactors clear APIs, and wires the new flow into the Fire dialog, automatic clearer, worker, and notifications with comprehensive tests.

Core (granular clearing):
- Add ManualDataClearing and AutomaticDataClearing interfaces and DataClearing implementation using FireDataStore options (TABS, DATA, DUCKAI_CHATS).
- Legacy/Granular selection gated by AndroidBrowserConfigFeature.moreGranularDataClearingOptions().
Automatic clearing:
- Refactor AutomaticDataClearer to delegate to granular flow when enabled; otherwise use legacy ClearWhatOption/ClearWhenOption.
- Update restart logic when clearing in foreground and background timer scheduling via WorkManager using new options.
- Update DataClearingWorker to use granular flow (kills process when needed) or legacy path.
Clear action API:
- Rename clearTabsOnly(appInForeground) to clearTabsAsync(appInForeground); add new clearTabsOnly() (no side effects).
- Add granular helpers: clearBrowserDataOnly(...), clearDuckAiChatsOnly().
UI integration:
- BrowserActivity and FireDialog use ManualDataClearing when feature flag enabled; otherwise keep legacy full-clear flow and restart behavior.
Notifications / DI:
- ClearDataNotification canShow() checks new automatic options when flag enabled.
- Wire dependencies in NotificationModule for new components.
Tests:
- Add DataClearingTest unit tests and expand instrumentation tests (AutomaticDataClearerTest, ClearPersonalDataActionTest, ClearDataNotificationTest) to cover granular vs legacy flows, timers, and restart behavior.

^{Written by Cursor Bugbot for commit ea6128c. This will update automatically on new commits. Configure here.}

0nko · 2025-12-14T13:01:14Z

Fire Dialog: Translations #7383
Fire Dialog: Granular fire bottom sheet #7359
Fire Dialog: New data clearing component #7351 👈 (View in Graphite)
Fire Dialog: New clear actions #7339
Fire Dialog: New feature flag #7295
Fire Dialog: Data storage #7282
develop

This stack of pull requests is managed by Graphite. Learn more about stacking.

app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt

app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt

cursor · 2025-12-14T13:26:03Z

Cursor Agent can help with this pull request. Just @cursor in comments and I'll start working on changes in this branch.
_{Learn more about Cursor Agents}

app/src/main/java/com/duckduckgo/app/fire/RealDataClearing.kt

app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt

app/src/main/java/com/duckduckgo/app/fire/DataClearing.kt

CDRussell · 2025-12-16T10:55:19Z

app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt

+                if (androidBrowserConfigFeature.moreGranularDataClearingOptions().isEnabled()) {
+                    val clearWhenOption = fireDataStore.getAutomaticallyClearWhenOption()
+                    val clearOptions = fireDataStore.getAutomaticClearOptions()


how does migration work here? e.g.

you already have the "old" config to auto clear

you update, and get this new logic

does it automatically migrate from the old config's data store to the new fireDataStore ?

@CDRussell It does. When the new options are accessed for the first time and there is no value stored, the old options are used.

Nice! thanks for clarifying

CDRussell · 2025-12-16T11:01:00Z

app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt

-        // the app does not have any activity in CREATED state we kill the process
-        if (settingsDataStore.automaticallyClearWhatOption != ClearWhatOption.CLEAR_NONE) {
-            clearDataAction.killProcess()
+        runBlocking(dispatchers.io()) {


contrary to cursor's suggestion, I think we should launch a coroutine here instead of runBlocking.

Worst case, our coroutine is prematurely cancelled because Android is killing our app. But that's ok, because the point of the coroutine was to kill the process anyway, so risk there is low.

On the other hand, there's potential to create an ANR with runBlocking. It's unlikely to be user-visible if it happens, but still, doesn't seem worth it here.

@CDRussell OK, thanks! I was trying to be cautious about changing the existing flow but that makes sense. I'll change it back.

Task/Issue URL: https://app.asana.com/1/137249556945/project/1207418217763355/task/1212373034728504?focus=true ### Description This PR adds a new `AutomaticDataClearing` and `ManualDataClearing` interface, which encapsulate the manual and automatic data-clearing functionality and the necessary side-effects. ### Steps to test this PR _Unit tests_ - [ ] Make sure all unit tests pass _Exisitng manual fire functionality_ - [x] Perform manual fire action - [x] Verify that tabs and data are cleared, as expected _Exisitng automatic fire functionality_ - [ ] Schedule automatic data-clearing (tabs only) set for app launch - [ ] Restart the app and check that tabs are cleared, as expected - [ ] Schedule automatic data-clearing (tabs and data) set for app launch - [ ] Verify that tabs and data are cleared, as expected _Duck.ai chats fire functionality_ - [ ] Go to Settings -> Data Clearing -> Enable Clear Duck.ai chats - [ ] Perform manual fire action for Data, tabs and chats - [ ] Verify that tabs, data and chats are cleared, as expected  --- > [!NOTE] > Introduces granular manual/automatic data-clearing (tabs, data, Duck.ai chats) behind a feature flag, refactors clear APIs, and wires the new flow into the Fire dialog, automatic clearer, worker, and notifications with comprehensive tests. > > - **Core (granular clearing)**: > - Add `ManualDataClearing` and `AutomaticDataClearing` interfaces and `DataClearing` implementation using `FireDataStore` options (`TABS`, `DATA`, `DUCKAI_CHATS`). > - Legacy/Granular selection gated by `AndroidBrowserConfigFeature.moreGranularDataClearingOptions()`. > - **Automatic clearing**: > - Refactor `AutomaticDataClearer` to delegate to granular flow when enabled; otherwise use legacy `ClearWhatOption`/`ClearWhenOption`. > - Update restart logic when clearing in foreground and background timer scheduling via `WorkManager` using new options. > - Update `DataClearingWorker` to use granular flow (kills process when needed) or legacy path. > - **Clear action API**: > - Rename `clearTabsOnly(appInForeground)` to `clearTabsAsync(appInForeground)`; add new `clearTabsOnly()` (no side effects). > - Add granular helpers: `clearBrowserDataOnly(...)`, `clearDuckAiChatsOnly()`. > - **UI integration**: > - `BrowserActivity` and `FireDialog` use `ManualDataClearing` when feature flag enabled; otherwise keep legacy full-clear flow and restart behavior. > - **Notifications / DI**: > - `ClearDataNotification` `canShow()` checks new automatic options when flag enabled. > - Wire dependencies in `NotificationModule` for new components. > - **Tests**: > - Add `DataClearingTest` unit tests and expand instrumentation tests (`AutomaticDataClearerTest`, `ClearPersonalDataActionTest`, `ClearDataNotificationTest`) to cover granular vs legacy flows, timers, and restart behavior. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit ea6128c. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup>

0nko mentioned this pull request Dec 14, 2025

Fire Dialog: New clear actions #7339

Merged

1 task

This was referenced Dec 14, 2025

Fire Dialog: Data storage #7282

Merged

Fire Dialog: New feature flag #7295

Merged

cursor bot reviewed Dec 14, 2025

View reviewed changes

app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt Show resolved Hide resolved

app/src/main/java/com/duckduckgo/app/global/view/FireDialog.kt Show resolved Hide resolved

cursor bot reviewed Dec 14, 2025

View reviewed changes

app/src/main/java/com/duckduckgo/app/fire/RealDataClearing.kt Outdated Show resolved Hide resolved

app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt Show resolved Hide resolved

0nko force-pushed the feature/ondrej/fire-dialog-data-clearing-interface branch 3 times, most recently from 626c9b6 to c0a512b Compare December 14, 2025 14:58

0nko requested a review from CDRussell December 15, 2025 22:30

0nko force-pushed the feature/ondrej/fire-dialog-data-clearing-interface branch from c0a512b to d1c9628 Compare December 15, 2025 22:59

0nko force-pushed the feature/ondrej/fire-dialog-new-clear-actions branch from adf4505 to 7c5f868 Compare December 15, 2025 22:59

0nko mentioned this pull request Dec 15, 2025

Fire Dialog: Granular fire bottom sheet #7359

Merged

51 tasks

0nko changed the title ~~Fire Dialog: New DataClearing interface~~ Fire Dialog: New data clearing component Dec 15, 2025

cursor bot reviewed Dec 15, 2025

View reviewed changes

app/src/main/java/com/duckduckgo/app/fire/AutomaticDataClearer.kt Show resolved Hide resolved

cursor bot reviewed Dec 16, 2025

View reviewed changes

app/src/main/java/com/duckduckgo/app/fire/DataClearing.kt Show resolved Hide resolved

CDRussell self-assigned this Dec 16, 2025

CDRussell reviewed Dec 16, 2025

View reviewed changes

CDRussell approved these changes Dec 16, 2025

View reviewed changes

0nko force-pushed the feature/ondrej/fire-dialog-new-clear-actions branch from 7c5f868 to f26080c Compare December 16, 2025 12:31

0nko force-pushed the feature/ondrej/fire-dialog-data-clearing-interface branch from 9a4ca65 to 920fef0 Compare December 16, 2025 12:31

0nko force-pushed the feature/ondrej/fire-dialog-new-clear-actions branch from f26080c to dff2a53 Compare December 17, 2025 15:15

0nko force-pushed the feature/ondrej/fire-dialog-data-clearing-interface branch 2 times, most recently from 86ce114 to 1a61594 Compare December 17, 2025 18:34

0nko force-pushed the feature/ondrej/fire-dialog-new-clear-actions branch from dff2a53 to 454a295 Compare December 17, 2025 18:34

0nko mentioned this pull request Dec 17, 2025

Fire Dialog: Translations #7383

Open

1 task

Base automatically changed from feature/ondrej/fire-dialog-new-clear-actions to develop December 18, 2025 12:20

0nko added 2 commits December 18, 2025 13:21

Add new DataClearing component

f712e0b

Update ClearDataAction

5b01ae4

0nko added 13 commits December 18, 2025 13:21

Update AutomaticDataClearer

82fcb43

Update all fire call sites to use the new DataClearing when FF enabled

6af4960

Extract process killing logic to the DataClearing interface

c0cc579

Update app last used flag value updates

41a1e32

Execut the onExit code synchronously

938f293

Separate DataClearing into manual and automatic clearing interface

56e0ec1

Optimize imports

588c857

Fix a bug with scheduling automatic clearing

01b309f

Rename the interface parameter to better reflect the behavior

ca581c5

Fix the clear data notification handling for the FF enabled case

1086195

Fix the unit tests

5004fd4

Run the onExit asynchronously

68929ed

Fix ktlint issues

ea6128c

0nko force-pushed the feature/ondrej/fire-dialog-data-clearing-interface branch from 1a61594 to ea6128c Compare December 18, 2025 12:22

0nko merged commit 1774ce1 into develop Dec 18, 2025
10 checks passed

0nko deleted the feature/ondrej/fire-dialog-data-clearing-interface branch December 18, 2025 13:00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fire Dialog: New data clearing component #7351

Fire Dialog: New data clearing component #7351

Uh oh!

0nko commented Dec 14, 2025 •

edited by cursor bot

Loading

Uh oh!

0nko commented Dec 14, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

cursor bot commented Dec 14, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CDRussell Dec 16, 2025

Uh oh!

0nko Dec 16, 2025

Uh oh!

CDRussell Dec 16, 2025

Uh oh!

CDRussell Dec 16, 2025

Uh oh!

0nko Dec 16, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Fire Dialog: New data clearing component #7351

Fire Dialog: New data clearing component #7351

Uh oh!

Conversation

0nko commented Dec 14, 2025 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Steps to test this PR

Uh oh!

0nko commented Dec 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor bot commented Dec 14, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CDRussell Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

0nko Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

CDRussell Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

CDRussell Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

0nko Dec 16, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

0nko commented Dec 14, 2025 •

edited by cursor bot

Loading

0nko commented Dec 14, 2025 •

edited

Loading