Adblock tweaks

Just some small cleanup so things download from where they should. Auditors: @diracdeltas Test Plan: will be tested in the context of other adblock tasks.
brave · Oct 14, 2016 · bc01069 · bc01069 · diracdeltas · Oct 14, 2016
1 parent 45f7075
commit bc01069
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/adBlock.js b/app/adBlock.js
@@ -101,7 +101,7 @@ const registerAppConfigForResource = (uuid, enabled, version) => {
  * @param uuid - The uuid of the adblock datafile resource
  * @param forAdblock - true if main frame URLs should be blocked
  */
-module.exports.updateAdblockDataFiles = (uuid, enabled, version = 1, shouldCheckMainFrame = false) => {
+module.exports.updateAdblockDataFiles = (uuid, enabled, version = 2, shouldCheckMainFrame = false) => {
   registerAppConfigForResource(uuid, enabled, version)
   if (!adblockInstances.has(uuid)) {
     const parser = new ABPFilterParser()

diff --git a/js/constants/appConfig.js b/js/constants/appConfig.js
@@ -36,15 +36,15 @@ module.exports = {
     url: getTargetAboutUrl('about:flash')
   },
   adblock: {
-    alternateDataFiles: 'https://s3.amazonaws.com/adblock-data/2/{uuid}.dat',
+    alternateDataFiles: 'https://s3.amazonaws.com/adblock-data/{version}/{uuid}.dat',
     url: 'https://s3.amazonaws.com/adblock-data/{version}/ABPFilterParserData.dat',
     version: '2',
     msBetweenRechecks: 1000 * 60 * 60 * 24, // 1 day
     enabled: true
   },
   safeBrowsing: {
-    url: 'https://s3.amazonaws.com/safe-browsing-data/{version}/SafeBrowsingData.dat',
-    version: '1',
+    url: 'https://s3.amazonaws.com/adblock-data/{version}/SafeBrowsingData.dat',
+    version: '2',
     msBetweenRechecks: 1000 * 60 * 60 * 24, // 1 day
     enabled: true
   },