From b3f151f3cbe54685aafa3289a30e67e94e0d1a71 Mon Sep 17 00:00:00 2001
From: jj <log@riseup.net>
Date: Wed, 30 Apr 2025 17:17:00 +0000
Subject: [PATCH] web/storage: move clearCacheStorage() logic to clear button

---
 web/src/components/settings/ClearStorageButton.svelte | 7 +++++--
 web/src/lib/storage.ts                                | 8 --------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/web/src/components/settings/ClearStorageButton.svelte b/web/src/components/settings/ClearStorageButton.svelte
index 725013aa..c5548b10 100644
--- a/web/src/components/settings/ClearStorageButton.svelte
+++ b/web/src/components/settings/ClearStorageButton.svelte
@@ -2,7 +2,7 @@
     import { t } from "$lib/i18n/translations";
     import { createDialog } from "$lib/state/dialogs";
     import { clearQueue } from "$lib/state/task-manager/queue";
-    import { clearCacheStorage, clearFileStorage } from "$lib/storage";
+    import { clearFileStorage } from "$lib/storage";
 
     import IconFileShredder from "@tabler/icons-svelte/IconFileShredder.svelte";
     import DataSettingsButton from "$components/settings/DataSettingsButton.svelte";
@@ -28,7 +28,10 @@
                     action: async () => {
                         clearQueue();
                         await clearFileStorage();
-                        await clearCacheStorage();
+                        if ('caches' in window) {
+                            const keys = await caches.keys();
+                            await Promise.all(keys.map(key => caches.delete(key)));
+                        }
                     },
                 },
             ],
diff --git a/web/src/lib/storage.ts b/web/src/lib/storage.ts
index 45bcf28f..5779c425 100644
--- a/web/src/lib/storage.ts
+++ b/web/src/lib/storage.ts
@@ -65,14 +65,6 @@ export const clearFileStorage = async () => {
     }
 }
 
-export const clearCacheStorage = async () => {
-    const keys = await caches.keys();
-
-    for (const key of keys) {
-        caches.delete(key);
-    }
-}
-
 export const getStorageQuota = async () => {
     let estimate;
     if (navigator.storage.estimate) {