Issue 4612 - enable AA on first run and make automatic adding of any subscription optional

lib/init.js

Index: lib/init.js
diff --git a/lib/init.js b/lib/init.js
index 197321802ae68e4204334f26b8b0a870816530a0..031112f6ba9026e957097e4d1ca59143b3d4ab24 100644
--- a/lib/init.js
+++ b/lib/init.js
@@ -51,18 +51,28 @@ FilterNotifier.addListener(function(action)
       let {Prefs} = require("prefs");
       let {Utils} = require("utils");
 
-      // Choose default subscription and add it
-      let subscriptions = require("subscriptions.xml");
-      let node = Utils.chooseFilterSubscription(subscriptions);
-      if (node)
+      if (Prefs.first_run_enable_current_locale_subscription)
       {
-        let subscription = Subscription.fromURL(node.url);
+        let subscriptions = require("subscriptions.xml");
+        let node = Utils.chooseFilterSubscription(subscriptions);
+        if (node)
+        {
+          let subscription = Subscription.fromURL(node.url);
+          FilterStorage.addSubscription(subscription);
+          subscription.disabled = false;
+          subscription.title = node.title;
+          subscription.homepage = node.homepage;
+          if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
+            Synchronizer.execute(subscription);
+        }
+      }
+      if (Prefs.first_run_enable_acceptable_ads)
+      {
+        let subscription = Subscription.fromURL(Prefs.subscriptions_exceptionsurl);
         FilterStorage.addSubscription(subscription);
         subscription.disabled = false;
-        subscription.title = node.title;
-        subscription.homepage = node.homepage;
         if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
-          Synchronizer.execute(subscription);
+          Synchronizer.execute(subscription);
       }
     }