Removing Whitelist and Blacklist from sync (GH-1138)

src/background.js

@@ -740,6 +740,11 @@ function onMessageHandler(request, sender, callback) {
 		utils.getActiveTab((tab) => {
 			if (tab && tab.id && tab.url.startsWith('http')) {
 				const settings = accounts.buildUserSettings();
+				// Blacklisted and whitelisted sites are removed from sync array,
+				// but we want to allow export and import these properties manually
+				settings.site_blacklist = conf.site_blacklist;
+				settings.site_whitelist = conf.site_whitelist;
+
 				try {
 					const hash = common.hashCode(JSON.stringify({ conf: settings }));
 					const backup = JSON.stringify({ hash, settings: { conf: settings } });

src/classes/ConfData.js

@@ -35,9 +35,8 @@ const { IS_CLIQZ } = globals;
  */
 class ConfData {
 	constructor() {
-		// paused_blocking, language and SYNC_SET do not get persisted
+		// language does not get persisted
 		this.language = this._getDefaultLanguage();
-		this.DONT_PERSIST_SET = new Set(globals.DONT_PERSIST_ARRAY);
 		this.SYNC_SET = new Set(globals.SYNC_ARRAY);
 	}
 

src/classes/Globals.js

@@ -97,10 +97,8 @@ class Globals {
 			'show_badge',
 			'show_cmp',
 			'show_tracker_urls',
-			'site_blacklist',
 			'site_specific_blocks',
 			'site_specific_unblocks',
-			'site_whitelist',
 			'toggle_individual_trackers',
 			'trackers_banner_status',
 		];