Issue 6403 - Updated adblockplusui dependency

lib/subscriptionInit.js

Index: lib/subscriptionInit.js
===================================================================
--- a/lib/subscriptionInit.js
+++ b/lib/subscriptionInit.js
@@ -23,10 +23,12 @@
        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;
@@ -48,7 +50,7 @@
   if (firstRun && (!FilterStorage.firstRun || Prefs.currentVersion))
     exports.reinitialized = true;
 
-  Prefs.currentVersion = require("info").addonVersion;
+  Prefs.currentVersion = info.addonVersion;
 }
 
 /**
@@ -204,8 +206,27 @@
       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();
 }