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

Side by Side Diff: libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java

Issue 29526696: Issue 5556 - remove WebRequest setter (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git
Patch Set: Created Aug. 24, 2017, 5:24 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.java ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 initCallbacks(); 247 initCallbacks();
248 248
249 androidWebRequest.updateSubscriptionURLs(engine.filterEngine); 249 androidWebRequest.updateSubscriptionURLs(engine.filterEngine);
250 250
251 return engine; 251 return engine;
252 } 252 }
253 253
254 private void createEngines() 254 private void createEngines()
255 { 255 {
256 engine.logSystem = new AndroidLogSystem(); 256 engine.logSystem = new AndroidLogSystem();
257 engine.jsEngine = new JsEngine(appInfo, engine.logSystem); 257 engine.jsEngine = new JsEngine(appInfo, engine.logSystem, engine.webReques t);
258 engine.jsEngine.setDefaultFileSystem(basePath); 258 engine.jsEngine.setDefaultFileSystem(basePath);
259 259
260 engine.jsEngine.setWebRequest(engine.webRequest);
261
262 engine.filterEngine = new FilterEngine(engine.jsEngine, isAllowedConnectio nCallback); 260 engine.filterEngine = new FilterEngine(engine.jsEngine, isAllowedConnectio nCallback);
263 } 261 }
264 } 262 }
265 263
266 public static Builder builder(AppInfo appInfo, String basePath) 264 public static Builder builder(AppInfo appInfo, String basePath)
267 { 265 {
268 return new Builder(appInfo, basePath); 266 return new Builder(appInfo, basePath);
269 } 267 }
270 268
271 public void dispose() 269 public void dispose()
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 public void setWhitelistedDomains(List<String> domains) 622 public void setWhitelistedDomains(List<String> domains)
625 { 623 {
626 this.whitelistedDomains = domains; 624 this.whitelistedDomains = domains;
627 } 625 }
628 626
629 public List<String> getWhitelistedDomains() 627 public List<String> getWhitelistedDomains()
630 { 628 {
631 return whitelistedDomains; 629 return whitelistedDomains;
632 } 630 }
633 } 631 }
OLDNEW
« no previous file with comments | « libadblockplus-android/src/org/adblockplus/libadblockplus/JsEngine.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld