Issue 5808 - Easyprivacy URL is being shown instead of the title

messageResponder.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 125 matching lines @@
   {
     let listenerFilters = changeListeners.get(page);
     if (!listenerFilters)
     {
       listenerFilters = Object.create(null);
       changeListeners.set(page, listenerFilters);
     }
     return listenerFilters;
   }
 
+  function addSubscription(subscription, properties)
+  {
+    subscription.disabled = false;
+    if ("title" in properties)
+      subscription.title = properties.title;
+    if ("homepage" in properties)
+      subscription.homepage = properties.homepage;
+
+    FilterStorage.addSubscription(subscription);
+    if (subscription instanceof DownloadableSubscription &&
+        !subscription.lastDownload)
+      Synchronizer.execute(subscription);
+  }
+
   port.on("app.get", (message, sender) =>
   {
     if (message.what == "issues")
     {
       let subscriptionInit = require("subscriptionInit");
       let result = subscriptionInit ? subscriptionInit.reinitialized : false;
       return {filterlistsReinitialized: result};
     }
 
     if (message.what == "doclink")
@@ skipping 168 matching lines @@
   {
     if (message.key == "notifications_ignoredcategories")
       return NotificationStorage.toggleIgnoreCategory("*");
 
     return Prefs[message.key] = !Prefs[message.key];
   });
 
   port.on("subscriptions.add", (message, sender) =>
   {
     let subscription = Subscription.fromURL(message.url);
-    if ("title" in message)
-      subscription.title = message.title;
-    if ("homepage" in message)
-      subscription.homepage = message.homepage;
-
     if (message.confirm)
     {
+      if ("title" in message)
+        subscription.title = message.title;
+      if ("homepage" in message)
+        subscription.homepage = message.homepage;
+
       ext.showOptions(() =>
       {
         sendMessage("app", "addSubscription", subscription);
       });
     }
     else
     {
-      subscription.disabled = false;
-      FilterStorage.addSubscription(subscription);
-
-      if (subscription instanceof DownloadableSubscription &&
-          !subscription.lastDownload)
-        Synchronizer.execute(subscription);
+      addSubscription(subscription, message);
     }
   });
 
   port.on("subscriptions.get", (message, sender) =>
   {
     let subscriptions = FilterStorage.subscriptions.filter((s) =>
     {
       if (message.ignoreDisabled && s.disabled)
         return false;
       if (s instanceof DownloadableSubscription && message.downloadable)
@@ skipping 24 matching lines @@
     let subscription = Subscription.fromURL(message.url);
     if (subscription.url in FilterStorage.knownSubscriptions)
     {
       if (subscription.disabled || message.keepInstalled)
         subscription.disabled = !subscription.disabled;
       else
         FilterStorage.removeSubscription(subscription);
     }
     else
     {
-      subscription.disabled = false;
-      subscription.title = message.title;
-      subscription.homepage = message.homepage;
-      FilterStorage.addSubscription(subscription);
-      if (!subscription.lastDownload)
-        Synchronizer.execute(subscription);
+      addSubscription(subscription, message);
     }
   });
 
   port.on("subscriptions.update", (message, sender) =>
   {
     let {subscriptions} = FilterStorage;
     if (message.url)
       subscriptions = [Subscription.fromURL(message.url)];
 
     for (let subscription of subscriptions)
     {
       if (subscription instanceof DownloadableSubscription)
         Synchronizer.execute(subscription, true);
     }
   });
 })(this);