src/org/adblockplus/android/AdvancedPreferences.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/AdvancedPreferences.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/AdvancedPreferences.java

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

index bf763be58e6d85af05150e005070b50c949820ae..cfe3e106f416f56f631432920dc7ff5fac41d6ea 100644

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

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

@@ -65,7 +65,7 @@ public class AdvancedPreferences extends SummarizedPreferences

this.serviceBinder = new ServiceBinder(this);

final PreferenceScreen screen = getPreferenceScreen();

- if (Utils.isNativeProxySupported(this))

+ if (ProxyService.GLOBAL_PROXY_USER_CONFIGURABLE)

{

screen.removePreference(findPreference(getString(R.string.pref_proxy)));

if (prefs.getBoolean(getString(R.string.pref_proxyautoconfigured), false))

@@ -200,7 +200,7 @@ public class AdvancedPreferences extends SummarizedPreferences

{

items.add("Has native proxy auto configured");

}

- if (Utils.isNativeProxySupported(this))

+ if (ProxyService.GLOBAL_PROXY_USER_CONFIGURABLE)

{

final ProxyProperties pp = ProxyProperties.fromContext(getApplicationContext());

if (pp != null)

« no previous file with comments | « no previous file | src/org/adblockplus/android/ConfigurationActivity.java » ('j') | no next file with comments »