Issue 6403 - Updated adblockplusui dependency

lib/subscriptionInit.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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/>.
  */
 
 /** @module subscriptionInit */
 
 "use strict";
 
 const {Subscription, DownloadableSubscription,
        SpecialSubscription} = require("subscriptionClasses");
 const {FilterStorage} = require("filterStorage");
 const {FilterNotifier} = require("filterNotifier");
+const info = require("info");
 const {Prefs} = require("prefs");
 const {Synchronizer} = require("synchronizer");
 const {Utils} = require("utils");
 const {initNotifications} = require("notificationHelper");
+const {updatesVersion} = require("ui");
 
 let firstRun;
 let subscriptionsCallback = null;
 
 /**
  * If there aren't any filters, the default subscriptions are added.
  * However, if patterns.ini already did exist and/or any preference
  * is set to a non-default value, this indicates that this isn't the
  * first run, but something went wrong.
  *
  * This function detects the first run, and makes sure that the user
  * gets notified (on the first run page) if the data appears incomplete
  * and therefore will be reinitialized.
  */
 function detectFirstRun()
 {
   firstRun = FilterStorage.subscriptions.length == 0;
 
   if (firstRun && (!FilterStorage.firstRun || Prefs.currentVersion))
     exports.reinitialized = true;
 
-  Prefs.currentVersion = require("info").addonVersion;
+  Prefs.currentVersion = info.addonVersion;
 }
 
 /**
  * Determines whether to add the default ad blocking subscription.
  * Returns true, if there are no filter subscriptions besides those
  * other subscriptions added automatically, and no custom filters.
  *
  * On first run, this logic should always result in true since there
  * is no data and therefore no subscriptions. But it also causes the
  * default ad blocking subscription to be added again after some
@@ skipping 135 matching lines @@
     subscriptions = subscriptionsCallback(subscriptions);
 
   for (let subscription of subscriptions)
   {
     FilterStorage.addSubscription(subscription);
     if (subscription instanceof DownloadableSubscription &&
         !subscription.lastDownload)
       Synchronizer.execute(subscription);
   }
 
-  if (firstRun && !Prefs.suppress_first_run_page)
-    browser.tabs.create({url: browser.extension.getURL("firstRun.html")});
+  if (!Prefs.suppress_first_run_page)
+  {
+    let page = null;
+    if (firstRun)
+    {
+      page = "firstRun.html";
+    }
+    // For now we're limiting the updates page to users of
+    // Chromium-based browsers to gage its impact
+    else if (info.platform == "chromium" &&
+        updatesVersion > Prefs.updates_version)

[kzar, 2018/01/23 10:07:13]

Nit: This indentation is quite unusual, mind putting the line below the one
above? E.g.

else if (info.platform == "chromium" &&
         updatesVersion > Prefs.updates_version)

instead of

else if (info.platform == "chromium" &&
    updatesVersion > Prefs.updates_version)

[Thomas Greiner, 2018/01/25 11:09:45]

Done.

I don't mind making such adjustments but it'd be great if we could stick to the
coding style. Otherwise we'll end up with every project team having undocumented
rules.

[kzar, 2018/01/25 11:46:25]

Yes, it would be great if ESLint could capture all our rules and conventions,
but it wasn't possible without false positives in practice. We tried our best
and it was a big improvement over no linting at least.

[Thomas Greiner, 2018/01/25 13:09:04]

Just to clarify: I'm not talking about linting rules but about what we define in
our coding style.

+    {
+      page = "updates.html";
+    }
+
+    if (page)
+    {
+      browser.tabs.create({url: browser.extension.getURL(page)});
+      Prefs.updates_version = updatesVersion;

[kzar, 2018/01/23 10:07:13]

Mind adding a short comment here explaining that we do this to prevent the
update page showing again either after it already was shown, but also for new
installs?

[Thomas Greiner, 2018/01/25 11:09:45]

Done.

[kzar, 2018/01/25 11:46:25]

Thanks but the main thing I wanted to mention was that for new users the updates
page would be suppressed too, since I initially thought this line was mistakenly
in the wrong place. Maybe something like this?

// For new users and users that have already seen this updates page we want to
// avoid it showing it the next time the extension is updated.

[Thomas Greiner, 2018/01/25 13:09:03]

Done. My bad.

Note that I replaced "the next time the extension is updated" with "subsequent
updates".

+    }
+  }
 
   initNotifications();
 }
 
 Promise.all([FilterNotifier.once("load"),
              Prefs.untilLoaded]).then(detectFirstRun)
                                 .then(getSubscriptions)
                                 .then(finishInitialization);
 
 /**
  * Indicates whether the default filter subscriptions have been added
  * again because there weren't any subscriptions even though this wasn't
  * the first run.
  *
  * @type {boolean}
  */
 exports.reinitialized = false;
 
 /**
  * Sets a callback that is called with an array of subscriptions to be added
  * during initialization. The callback must return an array of subscriptions
  * that will effectively be added.
  *
  * @param {function} callback
  */
 exports.setSubscriptionsCallback = callback =>
 {
   subscriptionsCallback = callback;
 };