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

lib/prefs.js

Index: lib/prefs.js
diff --git a/lib/prefs.js b/lib/prefs.js
index d15c3b02092a21ad843a44f03b6974937f47a555..04cb1b6b608d71d23b6516d1b4736c028b37366d 100644
--- a/lib/prefs.js
+++ b/lib/prefs.js
@@ -32,6 +32,7 @@ let defaults = {
   subscriptions_fallbackurl: "https://adblockplus.org/getSubscription?version=%VERSION%&url=%SUBSCRIPTION%&downloadURL=%URL%&error=%ERROR%&channelStatus=%CHANNELSTATUS%&responseStatus=%RESPONSESTATUS%",
   subscriptions_autoupdate: true,
   subscriptions_exceptionsurl: "https://easylist-downloads.adblockplus.org/exceptionrules.txt",
+  first_run_enable_acceptable_ads: true,
   documentation_link: "https://adblockplus.org/redirect?link=%LINK%&lang=%LANG%",
   update_url_release: "https://update.adblockplus.org/%NAME%/update.json?type=%TYPE%",
   update_url_devbuild: "https://adblockplus.org/devbuilds/%NAME%/update.json?type=%TYPE%",
@@ -44,10 +45,12 @@ let defaults = {
   notificationurl: "https://notification.adblockplus.org/notification.json",
   suppress_first_run_page: false,
   disable_auto_updates: false,
+  first_run_enable_current_locale_subscription: true,
   notifications_ignoredcategories: [],
 };
 
-let preconfigurable = ["suppress_first_run_page", "disable_auto_updates"];
+let preconfigurable = ["suppress_first_run_page", "disable_auto_updates",
+  "first_run_enable_acceptable_ads", "first_run_enable_current_locale_subscription"];
 
 let values;
 let path = _fileSystem.resolve("prefs.json");