src/org/adblockplus/libadblockplus/AppInfo.java - Issue 29329928: Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies

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/libadblockplus/AppInfo.java

Issue 29329928: Issue 3297 - Fix issues introduced by recent libadblockplus changes and update dependencies (Closed)

Patch Set: Created Nov. 10, 2015, 4:32 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

« jni/JniFilterEngine.cpp ('K') | « src/org/adblockplus/android/ProxyService.java ('k') | src/org/adblockplus/libadblockplus/FilterEngine.java » ('j') | src/org/adblockplus/libadblockplus/ShowNotificationCallback.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/org/adblockplus/libadblockplus/AppInfo.java

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

index 986b49dc902eda7214acf016b07d2b0ef44c0590..9c91073c09408855e408c6c641a1e0486b779fa0 100644

--- a/src/org/adblockplus/libadblockplus/AppInfo.java

+++ b/src/org/adblockplus/libadblockplus/AppInfo.java

@@ -19,7 +19,6 @@ package org.adblockplus.libadblockplus;

public class AppInfo

{

- public final String id;

public final String version;

public final String name;

public final String application;

@@ -27,10 +26,9 @@ public class AppInfo

public final String locale;

public final boolean developmentBuild;

- private AppInfo(final String id, final String version, final String name, final String application, final String applicationVersion,

+ private AppInfo(final String version, final String name, final String application, final String applicationVersion,

final String locale, final boolean developmentBuild)

{

- this.id = id;

this.version = version;

this.name = name;

this.application = application;

@@ -46,7 +44,6 @@ public class AppInfo

public static class Builder

{

- private String id = "";

private String version = "0";

private String name = "adblockplusandroid";

private String application = "android";

@@ -59,12 +56,6 @@ public class AppInfo

}

- public Builder setId(final String id)

- {

- this.id = id;

- return this;

- }

public Builder setVersion(final String version)

{

this.version = version;

@@ -103,7 +94,7 @@ public class AppInfo

public AppInfo build()

{

- return new AppInfo(this.id, this.version, this.name, this.application, this.applicationVersion, this.locale, this.developmentBuild);

+ return new AppInfo(this.version, this.name, this.application, this.applicationVersion, this.locale, this.developmentBuild);

}