Address PR review feedback

Author: greyivy

injected/integration-test/test-pages/duck-ai-data-clearing/config/enabled.json

@@ -5,9 +5,8 @@
         "duckAiDataClearing": {
         "state": "enabled",
         "settings": {
-            "chatsLocalStorageKey": "savedAIChats",
-            "chatImagesIndexDbName": "savedAIChatData",
-            "chatImagesObjectStoreName": "chat-images"
+            "chatsLocalStorageKeys": ["savedAIChats"],
+            "chatImagesIndexDbNameObjectStoreNamePairs": [["savedAIChatData", "chat-images"]]
         },
         "exceptions": []
         }

injected/playwright.config.js

@@ -52,7 +52,6 @@ export default defineConfig({
                 'integration-test/duckplayer-mobile-drawer.spec.js',
                 'integration-test/web-compat-android.spec.js',
                 'integration-test/message-bridge-android.spec.js',
-                'integration-test/duck-ai-data-clearing.spec.js',
             ],
             use: { injectName: 'android', platform: 'android', ...devices['Galaxy S5'] },
         },

injected/src/features.js

@@ -48,7 +48,7 @@ export const platformSupport = {
         'messageBridge',
         'favicon',
     ],
-    android: [...baseFeatures, 'webCompat', 'breakageReporting', 'duckPlayer', 'messageBridge', 'duckAiDataClearing'],
+    android: [...baseFeatures, 'webCompat', 'breakageReporting', 'duckPlayer', 'messageBridge'],
     'android-broker-protection': ['brokerProtection'],
     'android-autofill-import': ['autofillImport'],
     'android-adsjs': [

injected/src/features/duck-ai-data-clearing.js

@@ -14,18 +14,24 @@ export class DuckAiDataClearing extends ContentFeature {
     async clearData() {
         let success = true;
 
-        try {
-            this.clearSavedAIChats();
-        } catch (error) {
-            success = false;
-            this.log.error('Error clearing saved chats:', error);
+        const localStorageKeys = this.getFeatureSetting('chatsLocalStorageKeys');
+        for (const localStorageKey of localStorageKeys) {
+            try {
+                this.clearSavedAIChats(localStorageKey);
+            } catch (error) {
+                success = false;
+                this.log.error('Error clearing saved chats:', error);
+            }
         }
 
-        try {
-            await this.clearChatImagesStore();
-        } catch (error) {
-            success = false;
-            this.log.error('Error clearing saved chat images:', error);
+        const indexDbNameObjectStoreNamePairs = this.getFeatureSetting('chatImagesIndexDbNameObjectStoreNamePairs');
+        for (const [indexDbName, objectStoreName] of indexDbNameObjectStoreNamePairs) {
+            try {
+                await this.clearChatImagesStore(indexDbName, objectStoreName);
+            } catch (error) {
+                success = false;
+                this.log.error('Error clearing saved chat images:', error);
+            }
         }
 
         if (success) {
@@ -35,17 +41,12 @@ export class DuckAiDataClearing extends ContentFeature {
         }
     }
 
-    clearSavedAIChats() {
-        const localStorageKey = this.getFeatureSetting('chatsLocalStorageKey');
-
+    clearSavedAIChats(localStorageKey) {
         this.log.info(`Clearing '${localStorageKey}'`);
         window.localStorage.removeItem(localStorageKey);
     }
 
-    clearChatImagesStore() {
-        const indexDbName = this.getFeatureSetting('chatImagesIndexDbName');
-        const objectStoreName = this.getFeatureSetting('chatImagesObjectStoreName');
-
+    clearChatImagesStore(indexDbName, objectStoreName) {
         this.log.info(`Clearing '${indexDbName}' object store`);
 
         return new Promise((resolve, reject) => {