src/org/adblockplus/android/ABPEngine.java - Issue 6680224334872576: Issue 303 - Don't load element hiding rules - Code Review

Rietveld Code Review Tool

Help | Bug tracker | Discussion group | Source code

Issues

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

Issue 6680224334872576: Issue 303 - Don't load element hiding rules (Closed)

Patch Set: Naming, FIXME, whitelist-url Created Jan. 23, 2015, 1:28 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

« no previous file with comments | « no previous file | src/org/adblockplus/android/AndroidWebRequest.java » ('j') | src/org/adblockplus/android/AndroidWebRequest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 427578c1fbfe115a27f93133dac76732adeb8337..4ee210499316716ea32769af09cf73147e74297d 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') | src/org/adblockplus/android/AndroidWebRequest.java » ('J')

Powered by Google App Engine

This is Rietveld