libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java - Issue 29671734: Issue 6265 - Create shared AdblockEngine instance in AdblockWebView in background

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-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java

Issue 29671734: Issue 6265 - Create shared AdblockEngine instance in AdblockWebView in background (Closed)

Patch Set: addressed Diego's comments Created Jan. 19, 2018, 12:23 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

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

Index: libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java

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

index e5ae6099958d09478534f4b1264dadd2addf15ac..201830dcdb54a80cf4eda1436d3b2f33bd102460 100644

--- a/libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java

+++ b/libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/SettingsActivity.java

@@ -45,7 +45,7 @@ public class SettingsActivity

super.onCreate(savedInstanceState);

// retaining AdblockEngine asynchronously

- AdblockHelper.get().retain(true);

+ AdblockHelper.get().getProvider().retain(true);

insertGeneralFragment();

}

@@ -77,8 +77,8 @@ public class SettingsActivity

public AdblockEngine getAdblockEngine()

{

// if it's retained asynchronously we have to wait until it's ready

- AdblockHelper.get().waitForReady();

- return AdblockHelper.get().getEngine();

+ AdblockHelper.get().getProvider().waitForReady();

+ return AdblockHelper.get().getProvider().getEngine();

}

@Override

@@ -114,6 +114,6 @@ public class SettingsActivity

protected void onDestroy()

{

super.onDestroy();

- AdblockHelper.get().release();

+ AdblockHelper.get().getProvider().release();

}