src/org/adblockplus/android/ABPEngine.java - Issue 5153282527854592: Issue 98 - Use the libadblockplus update mechanism

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: src/org/adblockplus/android/ABPEngine.java

Issue 5153282527854592: Issue 98 - Use the libadblockplus update mechanism (Closed)

Patch Set: Reduce scope of UPDATE_NOTIFICATION_ID and move network error logging to AndroidUpdateCheckDoneCall… Created Sept. 26, 2014, 1:03 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 | « res/values/strings.xml ('k') | src/org/adblockplus/android/AdblockPlus.java » ('j') | src/org/adblockplus/android/AndroidUpdateCheckDoneCallback.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/org/adblockplus/android/ABPEngine.java

===================================================================

--- a/src/org/adblockplus/android/ABPEngine.java

+++ b/src/org/adblockplus/android/ABPEngine.java

@@ -21,7 +21,6 @@

import java.util.Locale;

import org.adblockplus.libadblockplus.AppInfo;

-import org.adblockplus.libadblockplus.EventCallback;

import org.adblockplus.libadblockplus.Filter;

import org.adblockplus.libadblockplus.FilterChangeCallback;

import org.adblockplus.libadblockplus.FilterEngine;

@@ -29,6 +28,7 @@

import org.adblockplus.libadblockplus.JsEngine;

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;

@@ -59,7 +59,7 @@

private volatile FilterEngine filterEngine;

private volatile LogSystem logSystem;

private volatile WebRequest webRequest;

- private volatile EventCallback updateCallback;

+ private volatile UpdateAvailableCallback updateAvailableCallback;

private volatile UpdateCheckDoneCallback updateCheckDoneCallback;

private volatile FilterChangeCallback filterChangeCallback;

@@ -105,10 +105,9 @@

engine.webRequest = new AndroidWebRequest();

engine.jsEngine.setWebRequest(engine.webRequest);

- engine.updateCallback = new AndroidUpdateAvailableCallback(context);

- engine.jsEngine.setEventCallback("updateAvailable", engine.updateCallback);

engine.filterEngine = new FilterEngine(engine.jsEngine);

+ engine.updateAvailableCallback = new AndroidUpdateAvailableCallback(context);

+ engine.filterEngine.setUpdateAvailableCallback(engine.updateAvailableCallback);

engine.filterChangeCallback = new AndroidFilterChangeCallback(context);

engine.filterEngine.setFilterChangeCallback(engine.filterChangeCallback);

@@ -144,10 +143,10 @@

this.webRequest = null;

}

- if (this.updateCallback != null)

+ if (this.updateAvailableCallback != null)

{

- this.updateCallback.dispose();

- this.updateCallback = null;

+ this.updateAvailableCallback.dispose();

+ this.updateAvailableCallback = null;

}

if (this.updateCheckDoneCallback != null)

« no previous file with comments | « res/values/strings.xml ('k') | src/org/adblockplus/android/AdblockPlus.java » ('j') | src/org/adblockplus/android/AndroidUpdateCheckDoneCallback.java » ('J')