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

Unified Diff: src/org/adblockplus/android/ABPEngine.java

Issue 6680224334872576: Issue 303 - Don't load element hiding rules (Closed)
Patch Set: Added check for valid, listed subscription. Created Nov. 18, 2014, 6:08 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/org/adblockplus/android/AndroidWebRequest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/org/adblockplus/android/ABPEngine.java
diff --git a/src/org/adblockplus/android/ABPEngine.java b/src/org/adblockplus/android/ABPEngine.java
index 41a0f41d081ef886dcf230764bfddd4e8bea7054..98fb94e6c2ab4fd13d22de156516e5d9cf61e98f 100644
--- a/src/org/adblockplus/android/ABPEngine.java
+++ b/src/org/adblockplus/android/ABPEngine.java
@@ -30,7 +30,6 @@ import org.adblockplus.libadblockplus.LogSystem;
import org.adblockplus.libadblockplus.Subscription;
import org.adblockplus.libadblockplus.UpdateAvailableCallback;
import org.adblockplus.libadblockplus.UpdateCheckDoneCallback;
-import org.adblockplus.libadblockplus.WebRequest;
import android.content.Context;
import android.content.pm.PackageInfo;
@@ -58,7 +57,7 @@ public final class ABPEngine
private volatile JsEngine jsEngine;
private volatile FilterEngine filterEngine;
private volatile LogSystem logSystem;
- private volatile WebRequest webRequest;
+ private volatile AndroidWebRequest webRequest;
private volatile UpdateAvailableCallback updateAvailableCallback;
private volatile UpdateCheckDoneCallback updateCheckDoneCallback;
private volatile FilterChangeCallback filterChangeCallback;
@@ -108,6 +107,9 @@ public final class ABPEngine
engine.jsEngine.setWebRequest(engine.webRequest);
engine.filterEngine = new FilterEngine(engine.jsEngine);
+
+ engine.webRequest.updateSubscriptionURLs(engine.filterEngine);
+
engine.updateAvailableCallback = new AndroidUpdateAvailableCallback(context);
engine.filterEngine.setUpdateAvailableCallback(engine.updateAvailableCallback);
engine.filterChangeCallback = new AndroidFilterChangeCallback(context);
« no previous file with comments | « no previous file | src/org/adblockplus/android/AndroidWebRequest.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld