Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/engine/Subscriptions.java

Issue 29524668: Issue 3916 - Supporting Adding filter lists via URL (Closed)
Left Patch Set: Renamed URLInputPreference and adjusted layout design Created Sept. 15, 2017, 12:36 p.m.
Right Patch Set: Use TAG constant for log, fix in MoreBlockingPreferenceCategory Created Oct. 10, 2017, 1:57 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « adblockplussbrowser/src/org/adblockplus/sbrowser/contentblocker/engine/Engine.java ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 { 196 {
197 // This is a temporary fix to not write filters that might crash Samsung Internet 197 // This is a temporary fix to not write filters that might crash Samsung Internet
198 // See https://issues.adblockplus.org/ticket/4772 198 // See https://issues.adblockplus.org/ticket/4772
199 if (!filter.matches(UNSUPPORTED_FILTERS_REGEX)) 199 if (!filter.matches(UNSUPPORTED_FILTERS_REGEX))
200 { 200 {
201 w.write(filter); 201 w.write(filter);
202 w.write('\n'); 202 w.write('\n');
203 } 203 }
204 else 204 else
205 { 205 {
206 w.write(filter);
207 w.write('\n');
diegocarloslima 2017/09/22 17:43:43 We shouldn't revert this temporary fix in this tic
jens 2017/09/26 10:25:02 Sorry, I don't know how these two lines slipped in
208 Log.d(TAG, "Ignoring unsupported filter: " + filter); 206 Log.d(TAG, "Ignoring unsupported filter: " + filter);
209 } 207 }
210 } 208 }
211 } 209 }
212 } 210 }
213 211
214 public Subscription add(final Subscription sub) 212 public Subscription add(final Subscription sub)
215 { 213 {
216 final String id = sub.getId(); 214 final String id = sub.getId();
217 if (!this.subscriptions.containsKey(id)) 215 if (!this.subscriptions.containsKey(id))
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 if (sub != null) 289 if (sub != null)
292 { 290 {
293 if (sub.updateSubscription(responseCode, text, httpHeaders, this.getMetaFi le(sub), 291 if (sub.updateSubscription(responseCode, text, httpHeaders, this.getMetaFi le(sub),
294 this.getFiltersFile(sub))) 292 this.getFiltersFile(sub)))
295 { 293 {
296 this.engine.requestUpdateBroadcast(); 294 this.engine.requestUpdateBroadcast();
297 } 295 }
298 } 296 }
299 } 297 }
300 } 298 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld