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

messageResponder.js

Index: messageResponder.js
===================================================================
--- a/messageResponder.js
+++ b/messageResponder.js
@@ -143,6 +143,20 @@
     return listenerFilters;
   }
 
+  function addSubscription(subscription, message)

[Thomas Greiner, 2017/09/29 16:39:18]

Detail: The name "message" here is quite generic. For this function the argument
only provides subscription property values so renaming it to something like
"props" would clarify what data we expect to find in it.

[saroyanm, 2017/09/29 16:58:56]

Done.

+  {
+    subscription.disabled = false;
+    if ("title" in message)

[saroyanm, 2017/09/29 14:35:17]

Lack of this check were causing the unexpected behavior, but still can't say for
sure why the URL were assigned to the title, we are not assigning the URL to the
title as in the current/old option page.

[Thomas Greiner, 2017/09/29 16:39:18]

The URL is used as a fallback whenever there's no title (see
https://hg.adblockplus.org/adblockplusui/file/tip/new-options.js#l89) so the
title seems to have mistakenly been overwritten with either `undefined`, `null`
or `""` which caused the URL to show up.

[saroyanm, 2017/09/29 16:58:56]

I see, thanks for the info.

+      subscription.title = message.title;
+    if ("homepage" in message)
+      subscription.homepage = message.homepage;
+
+    FilterStorage.addSubscription(subscription);
+    if (subscription instanceof DownloadableSubscription &&

[saroyanm, 2017/09/29 14:35:17]

Previously we were not checking if it's a DownloadableSubscription in "toggle
message", I think it wasn't intentional, but will value your comment here.

[Thomas Greiner, 2017/09/29 16:39:18]

Acknowledged.

+        !subscription.lastDownload)
+      Synchronizer.execute(subscription);
+  }
+
   port.on("app.get", (message, sender) =>
   {
     if (message.what == "issues")
@@ -331,13 +345,13 @@
   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);
@@ -345,12 +359,7 @@
     }
     else
     {
-      subscription.disabled = false;
-      FilterStorage.addSubscription(subscription);
-
-      if (subscription instanceof DownloadableSubscription &&
-          !subscription.lastDownload)
-        Synchronizer.execute(subscription);
+      addSubscription(subscription, message);
     }
   });
 
@@ -395,12 +404,7 @@
     }
     else
     {
-      subscription.disabled = false;
-      subscription.title = message.title;
-      subscription.homepage = message.homepage;
-      FilterStorage.addSubscription(subscription);
-      if (!subscription.lastDownload)
-        Synchronizer.execute(subscription);
+      addSubscription(subscription, message);
     }
   });