Issue 1262 - Wrong proxy configuration message

src/org/adblockplus/android/AdvancedPreferences.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 47 matching lines @@
   {
     super.onCreate(savedInstanceState);
 
     addPreferencesFromResource(R.xml.preferences_advanced);
 
     final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
     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))
       {
         screen.removePreference(findPreference(getString(R.string.pref_proxyenabled)));
       }
     }
     if (getResources().getBoolean(R.bool.def_release))
     {
       screen.removePreference(findPreference(getString(R.string.pref_support)));
@@ skipping 114 matching lines @@
               {
                 if (StringUtils.isNotEmpty(line))
                   items.add(line);
               }
             }
           }
           if (proxyService.isNativeProxyAutoConfigured())
           {
             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)
             {
               items.add("System settings:");
               items.add(String.format("Host: [%s] Port: [%d] Excl: [%s]", pp.getHost(), pp.getPort(), pp.getExclusionList()));
             }
           }
           items.add("Proxy settings:");
           items.add(String.format("Host: [%s] Port: [%s] Excl: [%s]", proxyService.proxy.props.getProperty("adblock.proxyHost"), proxyService.proxy.props.getProperty("adblock.proxyPort"),
@@ skipping 35 matching lines @@
               {
                 dialog.cancel();
               }
             });
         dialog = builder.create();
         break;
     }
     return dialog;
   }
 }