libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java - Issue 29533572: Issue 5556 - Update to use libadblockplus revision hg:566f64c8a2a8

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java

Issue 29533572: 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:41 a.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

« libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java ('K') | « libadblockplus-android/jni/JniIsAllowedConnectionTypeCallback.cpp ('k') | libadblockplus-android/src/org/adblockplus/libadblockplus/IsAllowedConnectionCallback.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java

diff --git a/libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java b/libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java

index 53398fa5078a8544b718eb8aee456b7ca2fb2a7d..f3d72d8fcd5fb844e30ee7c6b77be9986f149884 100644

--- a/libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java

+++ b/libadblockplus-android/src/org/adblockplus/libadblockplus/FilterEngine.java

@@ -36,13 +36,9 @@ public final class FilterEngine implements Disposable

OBJECT_SUBREQUEST, FONT, MEDIA

}

- public FilterEngine(final JsEngine jsEngine, final IsAllowedConnectionCallback isAllowedConnectionCallback)

+ public FilterEngine(final JsEngine jsEngine, final IsAllowedConnectionCallback isSubscriptionDownloadAllowedCallback)

{

- long jisAllowedConnectionCallbackPtr =

- (isAllowedConnectionCallback != null

- ? isAllowedConnectionCallback.ptr

- : 0l);

- this.ptr = ctor(jsEngine.ptr, jisAllowedConnectionCallbackPtr);

+ this.ptr = ctor(jsEngine.ptr, isSubscriptionDownloadAllowedCallback);

this.disposer = new Disposer(this, new DisposeWrapper(this.ptr));

}

@@ -230,7 +226,7 @@ public final class FilterEngine implements Disposable

private final static native void registerNatives();

- private final static native long ctor(long jsEnginePtr, long isAllowedConnectionCallbackPtr);

+ private final static native long ctor(long jsEnginePtr, IsAllowedConnectionCallback isSubscriptionDownloadAllowedCallback);

private final static native boolean isFirstRun(long ptr);