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 29524565: Issue 5556 - remove LogSystem setters (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git
Patch Set: address comments Created Aug. 24, 2017, 1:38 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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 246
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.jsEngine = new JsEngine(appInfo); 256 engine.logSystem = new AndroidLogSystem();
257 engine.jsEngine = new JsEngine(appInfo, engine.logSystem);
257 engine.jsEngine.setDefaultFileSystem(basePath); 258 engine.jsEngine.setDefaultFileSystem(basePath);
258 259
259 engine.jsEngine.setWebRequest(engine.webRequest); 260 engine.jsEngine.setWebRequest(engine.webRequest);
260 261
261 engine.logSystem = new AndroidLogSystem();
262 engine.jsEngine.setLogSystem(engine.logSystem);
263
264 engine.filterEngine = new FilterEngine(engine.jsEngine, isAllowedConnectio nCallback); 262 engine.filterEngine = new FilterEngine(engine.jsEngine, isAllowedConnectio nCallback);
265 } 263 }
266 } 264 }
267 265
268 public static Builder builder(AppInfo appInfo, String basePath) 266 public static Builder builder(AppInfo appInfo, String basePath)
269 { 267 {
270 return new Builder(appInfo, basePath); 268 return new Builder(appInfo, basePath);
271 } 269 }
272 270
273 public void dispose() 271 public void dispose()
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 public void setWhitelistedDomains(List<String> domains) 630 public void setWhitelistedDomains(List<String> domains)
633 { 631 {
634 this.whitelistedDomains = domains; 632 this.whitelistedDomains = domains;
635 } 633 }
636 634
637 public List<String> getWhitelistedDomains() 635 public List<String> getWhitelistedDomains()
638 { 636 {
639 return whitelistedDomains; 637 return whitelistedDomains;
640 } 638 }
641 } 639 }
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