Issue 5802 - Handle custom subscription creation

new-options.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 431 matching lines @@
     else
     {
       customFilters.push(filter.text);
       if (isCustomFiltersLoaded)
         updateCustomFiltersUi();
     }
 
     filtersMap[filter.text] = filter;
   }
 
+  function loadCustomFilters(filters)
+  {
+    for (let filter of filters)
+      updateFilter(filter);
+
+    setCustomFiltersView("read");
+    isCustomFiltersLoaded = true;
+  }
+
   function removeCustomFilter(text)
   {
     let index = customFilters.indexOf(text);
     if (index >= 0)
       customFilters.splice(index, 1);
 
     updateCustomFiltersUi();
   }
 
   function updateCustomFiltersUi()
@@ skipping 586 matching lines @@
 
   function populateLists()
   {
     subscriptionsMap = Object.create(null);
     filtersMap = Object.create(null);
 
     // Empty collections and lists
     for (let property in collections)
       collections[property].clearAll();
 
+    setCustomFiltersView("empty");
     ext.backgroundPage.sendMessage({
       type: "subscriptions.get",
       special: true
     },
     (subscriptions) =>
     {
       // Load filters
       for (let subscription of subscriptions)
       {
         ext.backgroundPage.sendMessage({
           type: "filters.get",
           subscriptionUrl: subscription.url
         },
         (filters) =>
         {
-          for (let filter of filters)
-            updateFilter(filter);
-
-          isCustomFiltersLoaded = true;
-          setCustomFiltersView("read");
+          loadCustomFilters(filters);
         });
       }
     });
     loadRecommendations();
     ext.backgroundPage.sendMessage({
       type: "prefs.get",
       key: "subscriptions_exceptionsurl"
     },
     (url) =>
     {
@@ skipping 115 matching lines @@
         break;
       case "downloading":
       case "downloadStatus":
       case "homepage":
       case "lastDownload":
       case "title":
         updateSubscription(subscription);
         break;
       case "added":
         let {url, recommended} = subscription;
-        if (url in subscriptionsMap)
+        // Handle custom subscription
+        if (/^~user/.test(url))

[saroyanm, 2017/09/27 20:05:41]

I don't think there is an easy way to check if this is a special subscription on
this stage.

I used your solution here as well, as it seems to be the easiest solution so
far, but I wander what should be the proper solution be, should we send request
and check the type of subscription each time a new subscription is added ? (I
don't feel like sending a lot of async request is also a good idea as well, but
still unsure)

+        {
+          loadCustomFilters(subscription.filters);
+          return;
+        }
+        else if (url in subscriptionsMap)
           updateSubscription(subscription);
         else
           addSubscription(subscription);
 
         if (isAcceptableAds(url))
           setAcceptableAds();
 
         if ((url == acceptableAdsUrl || recommended == "privacy") &&
           hasPrivacyConflict())
         {
@@ skipping 157 matching lines @@
   });
   ext.backgroundPage.sendMessage({
     type: "subscriptions.listen",
     filter: ["added", "disabled", "homepage", "lastDownload", "removed",
              "title", "downloadStatus", "downloading"]
   });
 
   window.addEventListener("DOMContentLoaded", onDOMLoaded, false);
   window.addEventListener("hashchange", onHashChange, false);
 }