Issue 394 - hit statistics tool data collection

lib/ui.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
 
 let {Utils} = require("utils");
 let {Prefs} = require("prefs");
 let {Policy} = require("contentPolicy");
 let {FilterStorage} = require("filterStorage");
 let {FilterNotifier} = require("filterNotifier");
+let {FilterHits} = require("filterHits");
 let {RequestNotifier} = require("requestNotifier");
 let {Filter} = require("filterClasses");
 let {Subscription, SpecialSubscription, DownloadableSubscription} = require("subscriptionClasses");
 let {Synchronizer} = require("synchronizer");
 let {KeySelector} = require("keySelector");
 let {Notification} = require("notification");
 let {initAntiAdblockNotification} = require("antiadblockInit");
 
 let CustomizableUI = null;
 
@@ skipping 1153 matching lines @@
    */
   toggleSaveStats: function(window)
   {
     if (Prefs.savestats)
     {
       if (!Utils.confirm(window, Utils.getString("clearStats_warning")))
         return;
 
       FilterStorage.resetHitCounts();
       Prefs.savestats = false;
+      if (Prefs.sendstats)
+      {
+        this.toggleSendStats();
+        return;

[Thomas Greiner, 2015/02/23 18:43:05]

The function returns here anyway so this `return` statement is redundant.

[saroyanm, 2015/02/28 15:24:30]

Done.

+      }
     }
     else
       Prefs.savestats = true;
   },
+  
+  /**
+   * Toggles "Send stats" option.
+   */
+  toggleSendStats: function(window)
+  {
+    if (Prefs.sendstats)
+    {
+      FilterHits.resetFilterHits();
+      Prefs.sendstats = false;
+    }
+    else
+      Prefs.sendstats = true;
+  },
 
   /**
    * Sets the current filter subscription in a single-subscription scenario,
    * all other subscriptions will be removed.
    */
   setSubscription: function(url, title)
   {
     let subscription = Subscription.fromURL(url);
     let currentSubscriptions = FilterStorage.subscriptions.filter(
       ((subscription) => subscription instanceof DownloadableSubscription && subscription.url != Prefs.subscriptions_exceptionsurl)
@@ skipping 319 matching lines @@
         generateLabel(prefix + "whitelistsite", location.spec.replace(/^mailto:/, ""));
         hideElement(prefix + "whitelistsite", false);
       }
     }
 
     setDisabled("abp-command-sendReport", !location || !Policy.isBlockableScheme(location) || location.scheme == "mailto");
 
     setChecked(prefix + "disabled", !Prefs.enabled);
     setChecked(prefix + "frameobjects", Prefs.frameobjects);
     setChecked(prefix + "savestats", Prefs.savestats);
+    setChecked(prefix + "sendstats", Prefs.sendstats);
 
     let {defaultToolbarPosition, statusbarPosition} = require("appSupport");
     let hasToolbar = defaultToolbarPosition;
     let hasStatusBar = statusbarPosition;
     hideElement(prefix + "showintoolbar", !hasToolbar || prefix == "abp-toolbar-");
     hideElement(prefix + "showinstatusbar", !hasStatusBar);
     hideElement(prefix + "iconSettingsSeparator", (prefix == "abp-toolbar-" || !hasToolbar) && !hasStatusBar);
 
     setChecked(prefix + "showintoolbar", this.isToolbarIconVisible());
     setChecked(prefix + "showinstatusbar", Prefs.showinstatusbar);
@@ skipping 388 matching lines @@
  * @type Array
  */
 let eventHandlers = [
   ["abp-command-sendReport", "command", UI.openReportDialog.bind(UI)],
   ["abp-command-filters", "command", UI.openFiltersDialog.bind(UI)],
   ["abp-command-sidebar", "command", UI.toggleBottombar.bind(UI)],
   ["abp-command-togglesitewhitelist", "command", function() { UI.toggleFilter(siteWhitelist); }],
   ["abp-command-togglepagewhitelist", "command", function() { UI.toggleFilter(pageWhitelist); }],
   ["abp-command-toggleobjtabs", "command", UI.togglePref.bind(UI, "frameobjects")],
   ["abp-command-togglesavestats", "command", UI.toggleSaveStats.bind(UI)],
+  ["abp-command-togglesendstats", "command", UI.toggleSendStats.bind(UI)],
   ["abp-command-togglesync", "command", UI.toggleSync.bind(UI)],
   ["abp-command-toggleshowintoolbar", "command", UI.toggleToolbarIcon.bind(UI)],
   ["abp-command-toggleshowinstatusbar", "command", UI.togglePref.bind(UI, "showinstatusbar")],
   ["abp-command-enable", "command", UI.togglePref.bind(UI, "enabled")],
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });