updated logic to display proper message

Author: malmstein

app/src/main/java/com/duckduckgo/app/browser/weblocalstorage/WebLocalStorageManager.kt

@@ -89,9 +89,13 @@ class DuckDuckGoWebLocalStorageManager @Inject constructor(
                     db.delete(entry.key)
                     logcat { "WebLocalStorageManager: Deleted key: $key" }
                 } else if (settingsDataStore.clearDuckAiData && domainForMatchingAllowedKey == DUCKDUCKGO_DOMAIN) {
-                    if (allowedKeys.none { key.endsWith(it) }) {
-                        db.delete(entry.key)
-                        logcat { "WebLocalStorageManager: Deleted key: $key" }
+                    if (key.endsWith("duckaiHasAgreedToTerms")) {
+                        logcat { "WebLocalStorageManager: Don't delete key: $key" }
+                    } else {
+                        if (allowedKeys.none { key.endsWith(it) }) {
+                            db.delete(entry.key)
+                            logcat { "WebLocalStorageManager: Deleted key: $key" }
+                        }
                     }
                 }
             }

app/src/main/java/com/duckduckgo/app/firebutton/FireButtonActivity.kt

@@ -94,7 +94,7 @@ class FireButtonActivity : DuckDuckGoActivity() {
             .flowWithLifecycle(lifecycle, Lifecycle.State.RESUMED)
             .onEach { viewState ->
                 viewState.let {
-                    updateAutomaticClearDataOptions(it.automaticallyClearData)
+                    updateAutomaticClearDataOptions(it.automaticallyClearData, it.clearDuckAiData)
                     updateSelectedFireAnimation(it.selectedFireAnimation)
                     updateClearDuckAiDataSetting(it.clearDuckAiData, it.showClearDuckAiDataSetting)
                 }
@@ -106,8 +106,11 @@ class FireButtonActivity : DuckDuckGoActivity() {
             .launchIn(lifecycleScope)
     }
 
-    private fun updateAutomaticClearDataOptions(automaticallyClearData: AutomaticallyClearData) {
-        val clearWhatSubtitle = getString(automaticallyClearData.clearWhatOption.nameStringResourceId())
+    private fun updateAutomaticClearDataOptions(
+        automaticallyClearData: AutomaticallyClearData,
+        clearDuckAiData: Boolean,
+    ) {
+        val clearWhatSubtitle = getString(automaticallyClearData.clearWhatOption.nameStringResourceId(clearDuckAiData))
         binding.automaticallyClearWhatSetting.setSecondaryText(clearWhatSubtitle)
 
         val clearWhenSubtitle = getString(automaticallyClearData.clearWhenOption.nameStringResourceId())
@@ -122,26 +125,33 @@ class FireButtonActivity : DuckDuckGoActivity() {
         binding.selectedFireAnimationSetting.setSecondaryText(subtitle)
     }
 
-    private fun updateClearDuckAiDataSetting(enabled: Boolean, isVisible: Boolean) {
+    private fun updateClearDuckAiDataSetting(
+        enabled: Boolean,
+        isVisible: Boolean,
+    ) {
         binding.clearDuckAiDataSetting.setIsChecked(enabled)
         binding.clearDuckAiDataSetting.visibility = if (isVisible) View.VISIBLE else View.GONE
     }
 
     private fun processCommand(it: Command) {
         when (it) {
             is Command.LaunchFireproofWebsites -> launchFireproofWebsites()
-            is Command.ShowClearWhatDialog -> launchAutomaticallyClearWhatDialog(it.option)
+            is Command.ShowClearWhatDialog -> launchAutomaticallyClearWhatDialog(it.option, it.clearDuckAi)
             is Command.ShowClearWhenDialog -> launchAutomaticallyClearWhenDialog(it.option)
             is Command.LaunchFireAnimationSettings -> launchFireAnimationSelector(it.animation)
         }
     }
 
     @StringRes
-    private fun ClearWhatOption.nameStringResourceId(): Int {
+    private fun ClearWhatOption.nameStringResourceId(clearDuckAi: Boolean): Int {
         return when (this) {
             ClearWhatOption.CLEAR_NONE -> R.string.settingsAutomaticallyClearWhatOptionNone
             ClearWhatOption.CLEAR_TABS_ONLY -> R.string.settingsAutomaticallyClearWhatOptionTabs
-            ClearWhatOption.CLEAR_TABS_AND_DATA -> R.string.settingsAutomaticallyClearWhatOptionTabsAndData
+            ClearWhatOption.CLEAR_TABS_AND_DATA -> if (clearDuckAi) {
+                R.string.settingsAutomaticallyClearWhatOptionTabsAndDataAndChats
+            } else {
+                R.string.settingsAutomaticallyClearWhatOptionTabsAndData
+            }
         }
     }
 
@@ -162,15 +172,22 @@ class FireButtonActivity : DuckDuckGoActivity() {
         startActivity(FireproofWebsitesActivity.intent(this), options)
     }
 
-    private fun launchAutomaticallyClearWhatDialog(option: ClearWhatOption) {
+    private fun launchAutomaticallyClearWhatDialog(
+        option: ClearWhatOption,
+        clearDuckAi: Boolean,
+    ) {
         val currentOption = option.getOptionIndex()
         RadioListAlertDialogBuilder(this)
             .setTitle(R.string.settingsAutomaticallyClearWhatDialogTitle)
             .setOptions(
                 listOf(
                     R.string.settingsAutomaticallyClearWhatOptionNone,
                     R.string.settingsAutomaticallyClearWhatOptionTabs,
-                    R.string.settingsAutomaticallyClearWhatOptionTabsAndData,
+                    if (clearDuckAi) {
+                        R.string.settingsAutomaticallyClearWhatOptionTabsAndDataAndChats
+                    } else {
+                        R.string.settingsAutomaticallyClearWhatOptionTabsAndData
+                    },
                 ),
                 currentOption,
             )

app/src/main/java/com/duckduckgo/app/firebutton/FireButtonViewModel.kt

@@ -66,7 +66,11 @@ class FireButtonViewModel @Inject constructor(
 
     sealed class Command {
         data object LaunchFireproofWebsites : Command()
-        data class ShowClearWhatDialog(val option: ClearWhatOption) : Command()
+        data class ShowClearWhatDialog(
+            val option: ClearWhatOption,
+            val clearDuckAi: Boolean,
+        ) : Command()
+
         data class ShowClearWhenDialog(val option: ClearWhenOption) : Command()
         data class LaunchFireAnimationSettings(val animation: FireAnimation) : Command()
     }
@@ -105,7 +109,14 @@ class FireButtonViewModel @Inject constructor(
     }
 
     fun onAutomaticallyClearWhatClicked() {
-        viewModelScope.launch { command.send(Command.ShowClearWhatDialog(viewState.value.automaticallyClearData.clearWhatOption)) }
+        viewModelScope.launch {
+            command.send(
+                Command.ShowClearWhatDialog(
+                    viewState.value.automaticallyClearData.clearWhatOption,
+                    viewState.value.clearDuckAiData,
+                ),
+            )
+        }
         pixel.fire(AppPixelName.SETTINGS_AUTOMATICALLY_CLEAR_WHAT_PRESSED)
     }
 

app/src/main/res/layout/activity_data_clearing.xml

@@ -72,11 +72,12 @@
                 app:primaryText="@string/settingsAutomaticallyClearWhen"
                 tools:secondaryText="test test test" />
 
-            <com.duckduckgo.common.ui.view.listitem.OneLineListItem
+            <com.duckduckgo.common.ui.view.listitem.TwoLineListItem
                 android:id="@+id/clearDuckAiDataSetting"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:primaryText="@string/settingsClearAiData"
+                app:primaryText="@string/settingsClearAiDataTitle"
+                app:secondaryText="@string/settingsClearAiDataTitle"
                 app:showSwitch="true" />
 
         </LinearLayout>

app/src/main/res/values/strings.xml

@@ -233,6 +233,7 @@
     <string name="settingsAutomaticallyClearWhatOptionNone">None</string>
     <string name="settingsAutomaticallyClearWhatOptionTabs">Tabs</string>
     <string name="settingsAutomaticallyClearWhatOptionTabsAndData">Tabs and data</string>
+    <string name="settingsAutomaticallyClearWhatOptionTabsAndDataAndChats">Tabs, data and Duck.ai chats</string>
 
     <string name="settingsAutomaticallyClearWhen">Clear On…</string>
     <string name="settingsAutomaticallyClearWhenDialogTitle">Clear on…</string>
@@ -242,7 +243,8 @@
     <string name="settingsAutomaticallyClearWhenAppExit15Minutes">App exit, inactive for 15 minutes</string>
     <string name="settingsAutomaticallyClearWhenAppExit30Minutes">App exit, inactive for 30 minutes</string>
     <string name="settingsAutomaticallyClearWhenAppExit60Minutes">App exit, inactive for 1 hour</string>
-    <string name="settingsClearAiData">Clear recent Duck.ai chats</string>
+    <string name="settingsClearAiDataTitle">Clear Duck.ai Chats</string>
+    <string name="settingsClearAiDataMessage">Let Fire Button also erase your recent Duck.ai chats</string>
 
     <!-- About Activity -->
     <string name="aboutActivityTitle">About DuckDuckGo</string>

app/src/test/java/com/duckduckgo/app/firebutton/FireButtonViewModelTest.kt

@@ -119,7 +119,7 @@ internal class FireButtonViewModelTest {
         testee.commands().test {
             testee.onAutomaticallyClearWhatClicked()
 
-            assertEquals(Command.ShowClearWhatDialog(ClearWhatOption.CLEAR_NONE), awaitItem())
+            assertEquals(Command.ShowClearWhatDialog(ClearWhatOption.CLEAR_NONE, false), awaitItem())
             verify(mockPixel).fire(AppPixelName.SETTINGS_AUTOMATICALLY_CLEAR_WHAT_PRESSED)
 
             cancelAndConsumeRemainingEvents()