3 files changed, 15 insertions, 15 deletions

diff --git a/src/api/LocalApi.js b/src/api/LocalApi.js
index e2a46874a..ccdedd3f5 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.js
@@ -16,7 +16,7 @@ export default class LocalApi {
     return this.local.getAppCacheSize();
   }
 
-  clearAppCache() {
-    return this.local.clearAppCache();
+  clearCache() {
+    return this.local.clearCache();
   }
 }
diff --git a/src/api/server/LocalApi.js b/src/api/server/LocalApi.js
index 2d9af416f..cc8035523 100644
--- a/src/api/server/LocalApi.js
+++ b/src/api/server/LocalApi.js
@@ -41,17 +41,14 @@ export default class LocalApi {
     });
   }
 
-  async clearCache(serviceId) {
-    const s = session.fromPartition(`persist:service-${serviceId}`);
+  async clearCache(serviceId = null) {
+    const s = serviceId ? session.fromPartition(`persist:service-${serviceId}`) : session.defaultSession;
 
-    debug('LocalApi::clearCache resolves', serviceId);
-    return s.clearCache();
-  }
-
-  async clearAppCache() {
-    const s = session.defaultSession;
-
-    debug('LocalApi::clearCache clearAppCache');
+    debug('LocalApi::clearCache resolves', (serviceId || 'clearAppCache'));
+    await s.clearStorageData({
+      storages: ['appcache', 'cookies', 'filesystem', 'indexdb', 'localstorage', 'shadercache', 'websql', 'serviceworkers', 'cachestorage'],
+      quotas: ['temporary', 'persistent', 'syncable'],
+    });
     return s.clearCache();
   }
 }
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index c8adb9c3c..e2e3760a8 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -52,7 +52,7 @@ export default class AppStore extends Store {
 
   @observable getAppCacheSizeRequest = new Request(this.api.local, 'getAppCacheSize');
 
-  @observable clearAppCacheRequest = new Request(this.api.local, 'clearAppCache');
+  @observable clearAppCacheRequest = new Request(this.api.local, 'clearCache');
 
   @observable autoLaunchOnStart = true;
 
@@ -378,8 +378,11 @@ export default class AppStore extends Store {
     const allServiceIds = await getServiceIdsFromPartitions();
     const allOrphanedServiceIds = allServiceIds.filter(id => !this.stores.services.all.find(s => id.replace('service-', '') === s.id));
 
-    await Promise.all(allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)));
-
+    try {
+      await Promise.all(allOrphanedServiceIds.map(id => removeServicePartitionDirectory(id)));
+    } catch (ex) {
+      console.log('Error while deleting service partition directory - ', ex);
+    }
     await Promise.all(this.stores.services.all.map(s => this.actions.service.clearCache({ serviceId: s.id })));
 
     await clearAppCache._promise;