Left: | ||
Right: |
LEFT | RIGHT |
---|---|
1 /* | 1 /* |
2 * This file is part of Adblock Plus <https://adblockplus.org/>, | 2 * This file is part of Adblock Plus <https://adblockplus.org/>, |
3 * Copyright (C) 2006-present eyeo GmbH | 3 * Copyright (C) 2006-present eyeo GmbH |
4 * | 4 * |
5 * Adblock Plus is free software: you can redistribute it and/or modify | 5 * Adblock Plus is free software: you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 3 as | 6 * it under the terms of the GNU General Public License version 3 as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
8 * | 8 * |
9 * Adblock Plus is distributed in the hope that it will be useful, | 9 * Adblock Plus is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
51 { | 51 { |
52 firstRun = FilterStorage.subscriptions.length == 0; | 52 firstRun = FilterStorage.subscriptions.length == 0; |
53 | 53 |
54 if (firstRun && (!FilterStorage.firstRun || Prefs.currentVersion)) | 54 if (firstRun && (!FilterStorage.firstRun || Prefs.currentVersion)) |
55 reinitialized = true; | 55 reinitialized = true; |
56 | 56 |
57 Prefs.currentVersion = info.addonVersion; | 57 Prefs.currentVersion = info.addonVersion; |
58 } | 58 } |
59 | 59 |
60 /** | 60 /** |
61 * Determines whether to add the default ad blocking subscription. | 61 * Determines whether to add the default ad blocking subscriptions. |
62 * Returns true, if there are no filter subscriptions besides those | 62 * Returns true, if there are no filter subscriptions besides those |
63 * other subscriptions added automatically, and no custom filters. | 63 * other subscriptions added automatically, and no custom filters. |
64 * | 64 * |
65 * On first run, this logic should always result in true since there | 65 * On first run, this logic should always result in true since there |
66 * is no data and therefore no subscriptions. But it also causes the | 66 * is no data and therefore no subscriptions. But it also causes the |
67 * default ad blocking subscription to be added again after some | 67 * default ad blocking subscriptions to be added again after some |
68 * data corruption or misconfiguration. | 68 * data corruption or misconfiguration. |
69 * | 69 * |
70 * @return {boolean} | 70 * @return {boolean} |
71 */ | 71 */ |
72 function shouldAddDefaultSubscription() | 72 function shouldAddDefaultSubscriptions() |
73 { | 73 { |
74 for (let subscription of FilterStorage.subscriptions) | 74 for (let subscription of FilterStorage.subscriptions) |
75 { | 75 { |
76 if (subscription instanceof DownloadableSubscription && | 76 if (subscription instanceof DownloadableSubscription && |
77 subscription.url != Prefs.subscriptions_exceptionsurl && | 77 subscription.url != Prefs.subscriptions_exceptionsurl && |
78 subscription.url != Prefs.subscriptions_antiadblockurl) | 78 subscription.url != Prefs.subscriptions_antiadblockurl) |
79 return false; | 79 return false; |
80 | 80 |
81 if (subscription instanceof SpecialSubscription && | 81 if (subscription instanceof SpecialSubscription && |
82 subscription.filters.length > 0) | 82 subscription.filters.length > 0) |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
203 if (supportsNotificationsWithButtons()) | 203 if (supportsNotificationsWithButtons()) |
204 { | 204 { |
205 let antiAdblockSubscription = Subscription.fromURL( | 205 let antiAdblockSubscription = Subscription.fromURL( |
206 Prefs.subscriptions_antiadblockurl | 206 Prefs.subscriptions_antiadblockurl |
207 ); | 207 ); |
208 antiAdblockSubscription.disabled = true; | 208 antiAdblockSubscription.disabled = true; |
209 subscriptions.push(antiAdblockSubscription); | 209 subscriptions.push(antiAdblockSubscription); |
210 } | 210 } |
211 } | 211 } |
212 | 212 |
213 // Add default ad blocking subscription (e.g. EasyList) | 213 // Add default ad blocking subscriptions (e.g. EasyList, Anti-Circumvention) |
214 // Ensure the Anti Circumvention is added on upgrade. | 214 let addDefaultSubscription = shouldAddDefaultSubscriptions(); |
Manish Jethani
2018/07/13 15:20:25
You mean anti-circumvention subscription?
hub
2018/07/13 17:23:59
Done.
| |
215 let addDefaultSubscription = shouldAddDefaultSubscription(); | 215 if (addDefaultSubscription || !Prefs.subscriptions_addedanticv) |
216 if (addDefaultSubscription || !Prefs.subscriptions_checkedanticv) | |
217 { | 216 { |
218 return fetch("subscriptions.xml") | 217 return fetch("subscriptions.xml") |
219 .then(response => response.text()) | 218 .then(response => response.text()) |
220 .then(text => | 219 .then(text => |
221 { | 220 { |
222 let doc = new DOMParser().parseFromString(text, "application/xml"); | 221 let doc = new DOMParser().parseFromString(text, "application/xml"); |
223 let nodes = doc.getElementsByTagName("subscription"); | 222 let nodes = doc.getElementsByTagName("subscription"); |
224 | 223 |
225 let defaultSubscriptions = chooseFilterSubscriptions(nodes); | 224 let defaultSubscriptions = chooseFilterSubscriptions(nodes); |
226 if (defaultSubscriptions) | 225 if (defaultSubscriptions) |
227 { | 226 { |
228 for (let name in defaultSubscriptions) | 227 for (let name in defaultSubscriptions) |
229 { | 228 { |
230 let node = defaultSubscriptions[name]; | 229 let node = defaultSubscriptions[name]; |
231 if (!node) | 230 if (!node) |
232 continue; | 231 continue; |
233 | 232 |
234 let type = node.getAttribute("type"); | |
235 if (!addDefaultSubscription && type != "circumvention") | |
236 continue; | |
237 | |
238 let url = node.getAttribute("url"); | 233 let url = node.getAttribute("url"); |
239 if (url) | 234 if (url) |
240 { | 235 { |
236 // Make sure that we don't add Easylist again if we want | |
237 // to just add the Anti-Circumvention subscription. | |
238 let type = node.getAttribute("type"); | |
239 if (!addDefaultSubscription && type != "circumvention") | |
240 continue; | |
241 | |
241 let subscription = Subscription.fromURL(url); | 242 let subscription = Subscription.fromURL(url); |
242 subscription.disabled = false; | 243 subscription.disabled = false; |
243 subscription.title = node.getAttribute("title"); | 244 subscription.title = node.getAttribute("title"); |
244 subscription.homepage = node.getAttribute("homepage"); | 245 subscription.homepage = node.getAttribute("homepage"); |
245 subscription.type = type; | 246 subscription.type = type; |
246 subscriptions.push(subscription); | 247 subscriptions.push(subscription); |
247 if (subscription.type == "circumvention") | 248 if (subscription.type == "circumvention") |
248 Prefs.subscriptions_checkedanticv = true; | 249 Prefs.subscriptions_addedanticv = true; |
249 } | 250 } |
250 } | 251 } |
251 } | 252 } |
252 | 253 |
253 return subscriptions; | 254 return subscriptions; |
254 }); | 255 }); |
255 } | 256 } |
256 | 257 |
257 return subscriptions; | 258 return subscriptions; |
258 } | 259 } |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
332 * | 333 * |
333 * @param {function} callback | 334 * @param {function} callback |
334 */ | 335 */ |
335 exports.setSubscriptionsCallback = callback => | 336 exports.setSubscriptionsCallback = callback => |
336 { | 337 { |
337 subscriptionsCallback = callback; | 338 subscriptionsCallback = callback; |
338 }; | 339 }; |
339 | 340 |
340 // Exports for tests only | 341 // Exports for tests only |
341 exports.chooseFilterSubscriptions = chooseFilterSubscriptions; | 342 exports.chooseFilterSubscriptions = chooseFilterSubscriptions; |
LEFT | RIGHT |