libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java - Issue 29453585: Issue 5288 - Pass android app name and version

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

Issue 29453585: Issue 5288 - Pass android app name and version (Closed)

Patch Set: Created June 1, 2017, 11:38 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

« no previous file with comments | « no previous file | libadblockplus-android-webviewapp/src/org/adblockplus/libadblockplus/android/webviewapp/Application.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java

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

index 2358295665018e23066267f9cf4df844b9fa54be..c33259851491d68684a01567a5cefe69a790f318 100644

--- a/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java

+++ b/libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java

@@ -56,8 +56,6 @@ public class AdblockHelper

private String settingsPreferenceName;

private String preloadedPreferenceName;

private Map<String, Integer> urlToResourceIdMap;

- private String application;

- private String applicationVersion;

private AdblockEngine engine;

private AdblockSettingsStorage storage;

private CountDownLatch engineCreated;

@@ -112,19 +110,14 @@ public class AdblockHelper

* recommended because it can be cleared by the system.

* @param developmentBuild debug or release?

* @param preferenceName Shared Preferences name to store adblock settings

- * @param application Technical name of the platform the app is running on (not user visible).

- * @param applicationVersion Current version of the platform the app is running on.

public AdblockHelper init(Context context, String basePath,

- boolean developmentBuild, String preferenceName,

- String application, String applicationVersion)

+ boolean developmentBuild, String preferenceName)

{

this.context = context.getApplicationContext();

this.basePath = basePath;

this.developmentBuild = developmentBuild;

this.settingsPreferenceName = preferenceName;

- this.application = application;

- this.applicationVersion = applicationVersion;

return this;

}

@@ -156,7 +149,7 @@ public class AdblockHelper

AdblockEngine.Builder builder = AdblockEngine

.builder(

- AdblockEngine.generateAppInfo(context, developmentBuild, application, applicationVersion),

+ AdblockEngine.generateAppInfo(context, developmentBuild),

basePath)

.setIsAllowedConnectionCallback(isAllowedConnectionCallback)

.enableElementHiding(true);