Improve manual proxy configuration

src/org/adblockplus/android/Preferences.java

 /*
  * This file is part of the Adblock Plus,
  * Copyright (C) 2006-2012 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 396 matching lines @@
         proxyService.setEmptyIcon(hideIcon);
     }
     super.onSharedPreferenceChanged(sharedPreferences, key);
   }
 
   private void showConfigurationMsg(String message)
   {
     ViewGroup grp = (ViewGroup) findViewById(R.id.grp_configuration);
     TextView msg = (TextView) findViewById(R.id.txt_configuration);
     msg.setText(Html.fromHtml(message));
-    View btn = findViewById(R.id.btn_configuration);
-    btn.setVisibility(ProxyService.NATIVE_PROXY_SUPPORTED ? View.VISIBLE : View.GONE);
     grp.setVisibility(View.VISIBLE);
   }
 
   private void hideConfigurationMsg()
   {
     ViewGroup grp = (ViewGroup) findViewById(R.id.grp_configuration);
     grp.setVisibility(View.GONE);
   }
 
   private BroadcastReceiver receiver = new BroadcastReceiver()
   {
     @Override
     public void onReceive(Context context, Intent intent)
     {
       String action = intent.getAction();
       Bundle extra = intent.getExtras();
       if (action.equals(ProxyService.BROADCAST_STATE_CHANGED))
       {
         if (extra.getBoolean("enabled"))
         {
           // Service is enabled in manual mode
           if (extra.getBoolean("manual"))
           {
             // Proxy is properly configured
             if (extra.getBoolean("configured"))
               hideConfigurationMsg();
             else
               showConfigurationMsg(getString(R.string.msg_configuration));

[Andrey Novikov, 2013/03/07 10:26:34]

This is for 2.x devices also, see my comments in strings.xml

           }
         }
         else
         {
           setFilteringEnabled(false);
           hideConfigurationMsg();
         }
       }
       if (action.equals(ProxyService.BROADCAST_PROXY_FAILED))
       {
@@ skipping 72 matching lines @@
   }
 
   private ServiceConnection proxyServiceConnection = new ServiceConnection()
   {
     public void onServiceConnected(ComponentName className, IBinder service)
     {
       proxyService = ((ProxyService.LocalBinder) service).getService();
       Log.d(TAG, "Proxy service connected");
 
       if (proxyService.isManual() && proxyService.noTraffic())
         showConfigurationMsg(getString(R.string.msg_configuration));

[Andrey Novikov, 2013/03/07 10:26:34]

This is for 2.x devices also, see my comments in strings.xml

     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }