src/org/adblockplus/android/ProxyConfigurationActivity.java - Issue 6074937345310720: Issue 1262 - Wrong proxy configuration message

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

Issue 6074937345310720: Issue 1262 - Wrong proxy configuration message (Closed)

Patch Set: Created Aug. 26, 2014, 12:51 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

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

diff --git a/src/org/adblockplus/android/ProxyConfigurationActivity.java b/src/org/adblockplus/android/ProxyConfigurationActivity.java

index 14fc958cc043dc08de8ac26f321661a07e899083..a5394a2f95dffac401d23edeca66c6924a277978 100644

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

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

@@ -20,7 +20,7 @@ public class ProxyConfigurationActivity extends Activity

final int port = getIntent().getIntExtra("port", 0);

final StringBuilder info = new StringBuilder();

- final int textId = Utils.isNativeProxySupported(this) ? R.raw.proxysettings : R.raw.proxysettings_old;

+ final int textId = ProxyService.GLOBAL_PROXY_USER_CONFIGURABLE ? R.raw.proxysettings : R.raw.proxysettings_old;

AdblockPlus.appendRawTextFile(this, info, textId);

final String msg = String.format(info.toString(), port);

@@ -28,7 +28,7 @@ public class ProxyConfigurationActivity extends Activity

tv.setText(Html.fromHtml(msg));

tv.setMovementMethod(LinkMovementMethod.getInstance());

- final Button buttonToHide = (Button) findViewById(Utils.isNativeProxySupported(this) ? R.id.gotit : R.id.opensettings);

+ final Button buttonToHide = (Button) findViewById(ProxyService.GLOBAL_PROXY_USER_CONFIGURABLE ? R.id.gotit : R.id.opensettings);

buttonToHide.setVisibility(View.GONE);

}