Issue 3515 - Use fetch() API instead XMLHttpRequest (Platform)

background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 206 matching lines @@
       subscription.disabled = true;
       FilterStorage.addSubscription(subscription);
       if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
         Synchronizer.execute(subscription);
     }
   }
 
   if (!addSubscription && !addAcceptable)
     return;
 
-  function notifyUser()
+  Promise.resolve(addSubscription && fetch("subscriptions.xml")
+    .then(function(response)
+    {
+      return response.text();
+    })
+    .then(function(text)
+    {
+      var doc = new DOMParser().parseFromString(text, "application/xml");
+      var nodes = doc.getElementsByTagName("subscription");
+      var node = Utils.chooseFilterSubscription(nodes);
+      var subscription = node && Subscription.fromURL(node.getAttribute("url"));
+
+      if (subscription)
+      {
+        FilterStorage.addSubscription(subscription);
+
+        subscription.disabled = false;
+        subscription.title = node.getAttribute("title");
+        subscription.homepage = node.getAttribute("homepage");
+
+        if (subscription instanceof DownloadableSubscription &&
+            !subscription.lastDownload)
+          Synchronizer.execute(subscription);
+      }
+    })
+  ).then(function()
   {
     if (!Prefs.suppress_first_run_page)
       ext.pages.open(ext.getURL("firstRun.html"));
-  }
-
-  if (addSubscription)
-  {
-    // Load subscriptions data
-    var request = new XMLHttpRequest();
-    request.open("GET", "subscriptions.xml");
-    request.addEventListener("load", function()
-    {
-      var node = Utils.chooseFilterSubscription(request.responseXML.getElementsByTagName("subscription"));
-      var subscription = (node ? Subscription.fromURL(node.getAttribute("url")) : null);
-      if (subscription)
-      {
-        FilterStorage.addSubscription(subscription);
-        subscription.disabled = false;
-        subscription.title = node.getAttribute("title");
-        subscription.homepage = node.getAttribute("homepage");
-        if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
-          Synchronizer.execute(subscription);
-
-          notifyUser();
-      }
-    }, false);
-    request.send(null);
-  }
-  else
-    notifyUser();
+  });
 }
 
 Prefs.onChanged.addListener(function(name)
 {
   if (name == "shouldShowBlockElementMenu")
     refreshIconAndContextMenuForAllPages();
 });
 
 // This is a hack to speedup loading of the options page on Safari.
 // Once we replaced the background page proxy with message passing
@@ skipping 151 matching lines @@
   }
 });
 
 // update icon when page changes location
 ext.pages.onLoading.addListener(function(page)
 {
   page.sendMessage({type: "clickhide-deactivate"});
   refreshIconAndContextMenu(page);
   showNextNotificationForUrl(page.url);
 });