libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/Application.java - Issue 29361445: Issue 4399 - Add WebView inheritor with ad blocking

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/Application.java

Issue 29361445: Issue 4399 - Add WebView inheritor with ad blocking (Closed)

Patch Set: fixes according to Diego's suggestions Created Nov. 9, 2016, 12:27 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 | « libadblockplus-android-webviewapp/res/values/strings.xml ('k') | libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/MainActivity.java » ('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/Application.java

diff --git a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/MockWebRequest.java b/libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/Application.java

similarity index 68%

copy from libadblockplus-android-tests/src/org/adblockplus/libadblockplus/MockWebRequest.java

copy to libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/Application.java

index d92e47b05b8e7406c90f2e3e94c3088c2d64d167..d82146b7a04c780873f3171658e53b8f1ca56394 100644

--- a/libadblockplus-android-tests/src/org/adblockplus/libadblockplus/MockWebRequest.java

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

@@ -15,16 +15,18 @@

* along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

-package org.adblockplus.libadblockplus;

+package org.adblockplus.libadblockplus.android.webviewapp;

-import java.util.List;

+import org.adblockplus.libadblockplus.android.settings.Adblock;

-public class MockWebRequest extends WebRequest

+public class Application extends android.app.Application

{

- public ServerResponse response = new ServerResponse();

+ @Override

+ public void onCreate()

+ {

+ super.onCreate();

- public ServerResponse httpGET(String url, List<HeaderEntry> headers)

- {

- return response;

- }

+ // init Adblock

+ Adblock.get().init(this, true, Adblock.PREFERENCE_NAME);

+ }

}