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 220 matching lines @@
     subscriptions = subscriptionsCallback(subscriptions);
 
   for (let subscription of subscriptions)
   {
     FilterStorage.addSubscription(subscription);
     if (subscription instanceof DownloadableSubscription &&
         !subscription.lastDownload)
       Synchronizer.execute(subscription);
   }
 
-  if (!Prefs.suppress_first_run_page)
+  if (firstRun || info.platform == "chromium" &&
+                  updatesVersion > Prefs.last_updates_page_displayed)
   {
-    let page = null;
-    if (firstRun)
+    Prefs.set("last_updates_page_displayed", updatesVersion).catch(() =>
     {
-      page = "firstRun.html";
-    }
-    // For now we're limiting the updates page to users of

[kzar, 2018/04/24 16:18:46]

Mind adding some comments back in? I don't mind if they're less verbose but IMO
it's useful to briefly explain the behaviour of this code - when each page is
expected to be displayed.

[Sebastian Noack, 2018/04/24 17:49:25]

OK, I added some more meaningful comments.

[kzar, 2018/04/25 10:53:51]

Thanks

-    // Chromium-based browsers to gage its impact
-    else if (info.platform == "chromium" &&
-             updatesVersion > Prefs.last_updates_page_displayed)
+      exports.dataCorrupted = true;
+    }).then(() =>
     {
-      page = "updates.html";
-    }
-
-    if (page)
-    {
-      browser.tabs.create({url: browser.extension.getURL(page)});
-
-      // For new users and users that have already seen this updates page we
-      // want to avoid showing it again for subsequent updates.
-      Prefs.last_updates_page_displayed = updatesVersion;
-    }
+      if (!Prefs.suppress_first_run_page)
+      {
+        let url;
+        if (firstRun || exports.dataCorrupted)
+          url = "firstRun.html";
+        else
+          url = "updates.html";
+        browser.tabs.create({url});
+      }
+    });
   }
 
   initNotifications();
 }
 
-Promise.all([FilterNotifier.once("load"),
-             Prefs.untilLoaded]).then(detectFirstRun)
-                                .then(getSubscriptions)
-                                .then(finishInitialization);
+Promise.all([
+  FilterNotifier.once("load"),
+  Prefs.untilLoaded.catch(() => { exports.dataCorrupted = true; })
+]).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;
 
 /**
+ * Indicates whether a data corruption was detcted.
+ *
+ * @type {boolean}
+ */
+exports.dataCorrupted = 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;
 };