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

lib/init.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 33 matching lines @@
     if (FilterStorage.firstRun)
     {
       // No data, must be a new user or someone with corrupted data - initialize
       // with default settings
 
       let {Subscription, DownloadableSubscription} = require("subscriptionClasses");
       let {Synchronizer} = require("synchronizer");
       let {Prefs} = require("prefs");
       let {Utils} = require("utils");
 
-      if (Prefs.first_run_enable_current_locale_subscription)
+      if (Prefs.first_run_subscription_auto_select)
       {
         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;
+          FilterStorage.addSubscription(subscription);
           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;
-        if (subscription instanceof DownloadableSubscription && !subscription.lastDownload)
-          Synchronizer.execute(subscription);
+
+        let aaSubscription = Subscription.fromURL(Prefs.subscriptions_exceptionsurl);
+        aaSubscription.disabled = false;
+        FilterStorage.addSubscription(aaSubscription);
+        if (aaSubscription instanceof DownloadableSubscription && !aaSubscription.lastDownload)
+          Synchronizer.execute(aaSubscription);
       }
     }
 
     filtersInitDone = true;
     checkInitialized();
   }
 });