Merge pull request #10836 from NejcZdovc/hotfix/#10829-adblock

Fixes cache problem with private tabs for siteSettings
brave · Sep 7, 2017 · 45de5e9 · 45de5e9
1 parent 7e30025
commit 45de5e9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/app/common/cache/braverySettingsCache.js b/app/common/cache/braverySettingsCache.js
@@ -12,12 +12,18 @@ const clearBraverySettingsCache = () => {
   currentBraverySettingsCache.clear()
 }
 
-const getBraverySettingsCache = (url) => {
-  return currentBraverySettingsCache.get(url)
+const getBraverySettingsCache = (url, isPrivate) => {
+  const key = generateKey(url, isPrivate)
+  return currentBraverySettingsCache.get(key)
 }
 
-const updateBraverySettingsCache = (url, braverySettings) => {
-  currentBraverySettingsCache.set(url, braverySettings)
+const updateBraverySettingsCache = (url, isPrivate, braverySettings) => {
+  const key = generateKey(url, isPrivate)
+  currentBraverySettingsCache.set(key, braverySettings)
+}
+
+const generateKey = (url, isPrivate) => {
+  return `${url}|${isPrivate}`
 }
 
 module.exports = {

diff --git a/app/filtering.js b/app/filtering.js
@@ -59,7 +59,7 @@ const registeredSessions = {}
 const permissionCallbacks = {}
 
 const getBraverySettingsForUrl = (url, appState, isPrivate) => {
-  const cachedBraverySettings = getBraverySettingsCache(url)
+  const cachedBraverySettings = getBraverySettingsCache(url, isPrivate)
   if (cachedBraverySettings) {
     return cachedBraverySettings
   }
@@ -70,7 +70,8 @@ const getBraverySettingsForUrl = (url, appState, isPrivate) => {
   if (isPrivate && tempSettings) {
     braverySettings = siteSettings.activeSettings(tempSettings, appState, appConfig)
   }
-  updateBraverySettingsCache(url, braverySettings)
+  updateBraverySettingsCache(url, isPrivate, braverySettings)
+
   return braverySettings
 }