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 29533564: Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8 (Closed) Base URL: github.com:abby-sergz/libadblockplus-android.git
Patch Set: Created Sept. 1, 2017, 9:38 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
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, engine.webReques t); 257 engine.jsEngine = new JsEngine(appInfo, engine.logSystem, engine.webReques t, basePath);
258 engine.jsEngine.setDefaultFileSystem(basePath);
259 258
260 engine.filterEngine = new FilterEngine(engine.jsEngine, isAllowedConnectio nCallback); 259 engine.filterEngine = new FilterEngine(engine.jsEngine, isAllowedConnectio nCallback);
261 } 260 }
262 } 261 }
263 262
264 public static Builder builder(AppInfo appInfo, String basePath) 263 public static Builder builder(AppInfo appInfo, String basePath)
265 { 264 {
266 return new Builder(appInfo, basePath); 265 return new Builder(appInfo, basePath);
267 } 266 }
268 267
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
616 public void setWhitelistedDomains(List<String> domains) 615 public void setWhitelistedDomains(List<String> domains)
617 { 616 {
618 this.whitelistedDomains = domains; 617 this.whitelistedDomains = domains;
619 } 618 }
620 619
621 public List<String> getWhitelistedDomains() 620 public List<String> getWhitelistedDomains()
622 { 621 {
623 return whitelistedDomains; 622 return whitelistedDomains;
624 } 623 }
625 } 624 }
OLDNEW

Powered by Google App Engine
This is Rietveld