Issue 5728 - Replace Services.vc.compare

lib/notification.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/>.
  */
 
 "use strict";
 
 /**
  * @fileOverview Handles notifications.
  */
 
-const {Services} = Cu.import("resource://gre/modules/Services.jsm", {});
-
 const {Prefs} = require("prefs");
 const {Downloader, Downloadable,
        MILLIS_IN_MINUTE, MILLIS_IN_HOUR, MILLIS_IN_DAY} = require("downloader");
 const {Utils} = require("utils");
 const {Matcher, defaultMatcher} = require("matcher");
 const {Filter, RegExpFilter, WhitelistFilter} = require("filterClasses");
+const {compareVersion} = require("coreUtils");
 
 const INITIAL_DELAY = 1 * MILLIS_IN_MINUTE;
 const CHECK_INTERVAL = 1 * MILLIS_IN_HOUR;
 const EXPIRATION_INTERVAL = 1 * MILLIS_IN_DAY;
 const TYPE = {
   information: 0,
   question: 1,
   relentless: 2,
   critical: 3
 };
@@ skipping 168 matching lines @@
     let notifications = localData.concat(remoteData);
     if (notifications.length === 0)
       return null;
 
     const {addonName, addonVersion, application,
            applicationVersion, platform, platformVersion} = require("info");
 
     let targetChecks = {
       extension: v => v == addonName,
       extensionMinVersion:
-        v => Services.vc.compare(addonVersion, v) >= 0,
+        v => compareVersion(addonVersion, v) >= 0,
       extensionMaxVersion:
-        v => Services.vc.compare(addonVersion, v) <= 0,
+        v => compareVersion(addonVersion, v) <= 0,
       application: v => v == application,
       applicationMinVersion:
-        v => Services.vc.compare(applicationVersion, v) >= 0,
+        v => compareVersion(applicationVersion, v) >= 0,
       applicationMaxVersion:
-        v => Services.vc.compare(applicationVersion, v) <= 0,
+        v => compareVersion(applicationVersion, v) <= 0,
       platform: v => v == platform,
       platformMinVersion:
-        v => Services.vc.compare(platformVersion, v) >= 0,
+        v => compareVersion(platformVersion, v) >= 0,
       platformMaxVersion:
-        v => Services.vc.compare(platformVersion, v) <= 0,
+        v => compareVersion(platformVersion, v) <= 0,
       blockedTotalMin: v => Prefs.show_statsinpopup &&
         Prefs.blocked_total >= v,
       blockedTotalMax: v => Prefs.show_statsinpopup &&
         Prefs.blocked_total <= v,
       locales: v => v.includes(Utils.appLocale)
     };
 
     let notificationToShow = null;
     for (let notification of notifications)
     {
@@ skipping 238 matching lines @@
     else if (index != -1 && forceValue !== true)
       categories.splice(index, 1);
 
     // HACK: JSON values aren't saved unless they are assigned a
     // different object.
     Prefs.notifications_ignoredcategories =
       JSON.parse(JSON.stringify(categories));
   }
 };
 Notification.init();