#1012 Integration mode switch

AdguardTeam · Aug 28, 2018 · cb36066 · cb36066
1 parent 4eaf3c6
commit cb36066
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/Extension/_locales/en/messages.json b/Extension/_locales/en/messages.json
@@ -320,6 +320,9 @@
     "options_use_optimized_filters": {
         "message": "Use optimized filters<span class='sp-table-row-info'>Light filter lists optimized for mobile devices<\/span>"
     },
+    "options_disable_integration_mode": {
+        "message": "Enable integration mode"
+    },
     "options_popup_update_title": {
         "message": "Filters updated successfully"
     },

diff --git a/Extension/lib/filter/integration.js b/Extension/lib/filter/integration.js
@@ -313,7 +313,7 @@ adguard.integration = (function (adguard) {
          * @returns {boolean}
          */
         isEnabled: function () {
-            return !integrationModeForceDisabled;
+            return adguard.settings.isIntegrationModeEnabled() && !integrationModeForceDisabled;
         },
 
         /**

diff --git a/Extension/lib/pages/options.js b/Extension/lib/pages/options.js
@@ -1030,6 +1030,7 @@ var Settings = function () {
     checkboxes.push(new Checkbox('#showAppUpdatedNotification', userSettings.names.DISABLE_SHOW_APP_UPDATED_NOTIFICATION, {
         negate: true
     }));
+    checkboxes.push(new Checkbox('#integrationModeCheckbox', userSettings.names.DISABLE_INTEGRATION_MODE, {negate: true}));
 
     var allowAcceptableAdsCheckbox = document.querySelector("#allowAcceptableAds");
     allowAcceptableAdsCheckbox.addEventListener('change', function () {

diff --git a/Extension/lib/utils/user-settings.js b/Extension/lib/utils/user-settings.js
@@ -34,7 +34,8 @@ adguard.settings = (function (adguard) {
         DISABLE_SHOW_CONTEXT_MENU: 'context-menu-disabled',
         USE_OPTIMIZED_FILTERS: 'use-optimized-filters',
         DEFAULT_WHITE_LIST_MODE: 'default-whitelist-mode',
-        DISABLE_SHOW_APP_UPDATED_NOTIFICATION: 'show-app-updated-disabled'
+        DISABLE_SHOW_APP_UPDATED_NOTIFICATION: 'show-app-updated-disabled',
+        DISABLE_INTEGRATION_MODE: 'integration-mode-disabled'
     };
 
     var properties = Object.create(null);
@@ -61,6 +62,7 @@ adguard.settings = (function (adguard) {
                 defaults[settings.USE_OPTIMIZED_FILTERS] = adguard.prefs.mobile;
                 defaults[settings.DISABLE_DETECT_FILTERS] = false;
                 defaults[settings.DISABLE_SHOW_APP_UPDATED_NOTIFICATION] = false;
+                defaults[settings.DISABLE_INTEGRATION_MODE] = false;
                 return defaults;
             });
         }
@@ -167,6 +169,14 @@ adguard.settings = (function (adguard) {
         setProperty(settings.DISABLE_SHOW_APP_UPDATED_NOTIFICATION, !show, options);
     };
 
+    var isIntegrationModeEnabled = function () {
+        return !getProperty(settings.DISABLE_INTEGRATION_MODE);
+    };
+
+    var changeIntegrationModeEnabled = function (show, options) {
+        setProperty(settings.DISABLE_INTEGRATION_MODE, !show, options);
+    };
+
     var changeEnableSafebrowsing = function (enabled, options) {
         setProperty(settings.DISABLE_SAFEBROWSING, !enabled);
 
@@ -252,6 +262,8 @@ adguard.settings = (function (adguard) {
     api.isUseOptimizedFiltersEnabled = isUseOptimizedFiltersEnabled;
     api.changeUseOptimizedFiltersEnabled = changeUseOptimizedFiltersEnabled;
     api.changeDefaultWhiteListMode = changeDefaultWhiteListMode;
+    api.isIntegrationModeEnabled = isIntegrationModeEnabled;
+    api.changeIntegrationModeEnabled = changeIntegrationModeEnabled;
 
     return api;
 

diff --git a/Extension/pages/options.html b/Extension/pages/options.html
@@ -306,6 +306,15 @@
                             <input type="checkbox" class="sp-table-row-input" id="useOptimizedFilters"/>
                         </div>
                     </li>
+                    <li>
+                        <div>
+                            <div class="opt-name" i18n="options_disable_integration_mode"></div>
+                            <div class="opt-state"></div>
+                        </div>
+                        <div class="opt-state input">
+                            <input type="checkbox" class="sp-table-row-input" id="integrationModeCheckbox"/>
+                        </div>
+                    </li>
                     <li>
                         <div class="opt-name" i18n="options_collect_hit_stats"></div>
                         <div class="opt-state">