Issue 6599 - Detect data corruption of storage.local

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
@@ skipping 13 matching lines @@
        SpecialSubscription} =
   require("../adblockpluscore/lib/subscriptionClasses");
 const {FilterStorage} = require("../adblockpluscore/lib/filterStorage");
 const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
 const info = require("../buildtools/info");
 const {Prefs} = require("./prefs");
 const {Synchronizer} = require("../adblockpluscore/lib/synchronizer");
 const {Utils} = require("./utils");
 const {initNotifications} = require("./notificationHelper");
 const {updatesVersion} = require("../adblockplusui/lib/prefs");
-const {setUninstallURL} = require("./uninstall");
 
 let firstRun;
 let subscriptionsCallback = null;
 let reinitialized = false;
 let dataCorrupted = false;
 
 /**
  * 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
@@ skipping 204 matching lines @@
                   updatesVersion > Prefs.last_updates_page_displayed)
   {
     return Prefs.set("last_updates_page_displayed", updatesVersion).catch(() =>
     {
       dataCorrupted = true;
     }).then(() =>
     {
       if (!Prefs.suppress_first_run_page)
       {
         // Always show the first run page if a data corruption was detected
-        // (either though failure of reading from or writing to storage.local).
+        // (either through failure of reading from or writing to storage.local).
         // The first run page notifies the user about the data corruption.
         let url;
         if (firstRun || dataCorrupted)
           url = "firstRun.html";
         else
           url = "updates.html";
         browser.tabs.create({url});
       }
     });
   }
 }
 
 Promise.all([
   FilterNotifier.once("load"),
   Prefs.untilLoaded.catch(() => { dataCorrupted = true; })
 ]).then(detectFirstRun)
   .then(getSubscriptions)
   .then(addSubscriptionsAndNotifyUser)
-  .then(setUninstallURL)
+  // We have to require the "uninstall" module on demand,
+  // as the "uninstall" module in turn requires this module.
+  .then(() => { require("./uninstall").setUninstallURL(); })
   .then(initNotifications);
 
 /**
  * Gets a value indicating whether the default filter subscriptions have been
  * added again because there weren't any subscriptions even though this wasn't
  * the first run.
  *
  * @return {boolean}
  */
 exports.isReinitialized = () => reinitialized;
 
 /**
  * Gets a value indicating whether a data corruption was detected.
  *
  * @return {boolean}
  */
 exports.isDataCorrupted = () => dataCorrupted;
 
 /**
  * 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;
 };