#68 optimized filters

AdguardTeam · Nov 27, 2015 · 5e8b9bb · 5e8b9bb
1 parent 2bc46c3
commit 5e8b9bb
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 8 deletions.
diff --git a/Extension/browser/firefox/lib/ui.js b/Extension/browser/firefox/lib/ui.js
@@ -302,6 +302,14 @@ var UI = exports.UI = {
         });
     },
 
+    reloadAntiBannerFilters: function () {
+        this.antiBannerService.reloadAntiBannerFilters(function (updatedFilters) {
+            EventNotifier.notifyListeners(EventNotifierTypes.UPDATE_FILTERS_SHOW_POPUP, true, updatedFilters);
+        }, function () {
+            EventNotifier.notifyListeners(EventNotifierTypes.UPDATE_FILTERS_SHOW_POPUP, false);
+        });
+    },
+
     getLocalizedMessage: function (messageId, args) {
         return i18n.getMessage(messageId, args);
     },

diff --git a/Extension/browser/webkit/ui.js b/Extension/browser/webkit/ui.js
@@ -558,6 +558,14 @@ var UI = {
 		});
 	},
 
+	reloadAntiBannerFilters: function () {
+		antiBannerService.reloadAntiBannerFilters(function (updatedFilters) {
+			EventNotifier.notifyListeners(EventNotifierTypes.UPDATE_FILTERS_SHOW_POPUP, true, updatedFilters);
+		}, function () {
+			EventNotifier.notifyListeners(EventNotifierTypes.UPDATE_FILTERS_SHOW_POPUP, false);
+		});
+	},
+
 	checkAntiBannerFiltersUpdate: function () {
 		antiBannerService.checkAntiBannerFiltersUpdate(true, function (updatedFilters) {
 			EventNotifier.notifyListeners(EventNotifierTypes.UPDATE_FILTERS_SHOW_POPUP, true, updatedFilters);

diff --git a/Extension/lib/content-message-handler.js b/Extension/lib/content-message-handler.js
@@ -111,6 +111,10 @@ ContentMessageHandler.prototype = {
                 this.UI.checkAntiBannerFiltersUpdate();
                 callback({});
                 break;
+            case 'reloadAntiBannerFilters':
+                this.UI.reloadAntiBannerFilters();
+                callback({});
+                break;
             case 'getAntiBannerFiltersForOptionsPage':
                 var renderedFilters = this.antiBannerService.getAntiBannerFiltersForOptionsPage();
                 callback({filters: renderedFilters});

diff --git a/Extension/lib/filter/antibanner.js b/Extension/lib/filter/antibanner.js
@@ -178,7 +178,7 @@ AntiBannerService.prototype = {
             }
 
             // Schedule filters update job
-            context._scheduleFiltersUpdate();
+            context._scheduleFiltersUpdate(runInfo.isFirstRun);
 
         }.bind(this);
 
@@ -722,6 +722,17 @@ AntiBannerService.prototype = {
         this.serviceClient.sendUrlReport(url, messageType, comment);
     },
 
+    /**
+     * Reloads filters from backend
+     *
+     * @param successCallback
+     * @param errorCallback
+     */
+    reloadAntiBannerFilters: function (successCallback, errorCallback) {
+        this._resetFiltersVersion();
+        this.checkAntiBannerFiltersUpdate(true, successCallback, errorCallback);
+    },
+
     /**
      * Checks filters updates.
      *
@@ -830,6 +841,17 @@ AntiBannerService.prototype = {
         }
     },
 
+    /**
+     * Resets all filters versions
+     */
+    _resetFiltersVersion: function () {
+        var RESET_VERSION = "1.0.0.0";
+
+        for (var i = 0; i < this.adguardFilters.length; i++) {
+            this.adguardFilters[i].version = RESET_VERSION;
+        }
+    },
+
     /**
      * Returns all filters with their metadata
      * @private
@@ -1147,10 +1169,15 @@ AntiBannerService.prototype = {
 
     /**
      * Schedules filters update job
+     * @isFirstRun
      * @private
      */
-    _scheduleFiltersUpdate: function () {
+    _scheduleFiltersUpdate: function (isFirstRun) {
         var updateFunc = this.checkAntiBannerFiltersUpdate.bind(this);
+        if (isFirstRun && Utils.isContentBlockerEnabled()) {
+            updateFunc = this.reloadAntiBannerFilters.bind(this);
+        }
+
         // First run delay
         setTimeout(updateFunc, this.UPDATE_FILTERS_DELAY);
 

diff --git a/Extension/lib/pages/options.js b/Extension/lib/pages/options.js
@@ -368,14 +368,13 @@ PageController.prototype = {
 
     changeUseOptimizedFilters: function (e) {
         e.preventDefault();
-
-        //TODO: Set filter versions to 1.0
-        //TODO: If ContentBlocker set filters to 1.0 on first start
-
+        var self = this;
         contentPage.sendMessage({
             type: 'changeUserSetting',
             key: userSettings.names.USE_OPTIMIZED_FILTERS,
-            value: this.checked
+            value: self.checked
+        }, function() {
+            contentPage.sendMessage({type: 'reloadAntiBannerFilters'});
         });
     },
 

diff --git a/Extension/lib/utils/service-client.js b/Extension/lib/utils/service-client.js
@@ -38,7 +38,7 @@ var ServiceClient = exports.ServiceClient = function () {
 
 	// Base url of our backend server
 	this.backendUrl = "https://chrome.adtidy.org";
-	this.mobileBackendUrl = "https://mobile.adtidy.org";
+	this.mobileBackendUrl = "http://mobile.adtidy.org/api/1.0";
     this.apiKey = "4DDBE80A3DA94D819A00523252FB6380";
 
 	//URL for downloading AG filters