ABP/Android Proxy switch

src/org/adblockplus/android/AdvancedPreferences.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 44 matching lines @@
 
   private ProxyService proxyService = null;
 
   @Override
   public void onCreate(Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
 
     addPreferencesFromResource(R.xml.preferences_advanced);
 
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+
     PreferenceScreen screen = getPreferenceScreen();
     if (ProxyService.NATIVE_PROXY_SUPPORTED)
     {
       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)));
     }
     else
     {
       Preference prefUpdate = findPreference(getString(R.string.pref_checkupdate));
       prefUpdate.setOnPreferenceClickListener(new OnPreferenceClickListener()
       {
@@ skipping 30 matching lines @@
   @Override
   public void onPause()
   {
     super.onPause();
     disconnect();
   }
 
   @Override
   public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key)
   {
+    if (getString(R.string.pref_proxyenabled).equals(key))
+    {
+      AdblockPlus application = AdblockPlus.getApplication();
+      boolean enabled = sharedPreferences.getBoolean(key, false);
+      boolean serviceRunning = application.isServiceRunning();
+      if (enabled && !serviceRunning)
+      {
+        startService(new Intent(this, ProxyService.class));
+      }
+      else
+      {
+        if (serviceRunning)
+          stopService(new Intent(this, ProxyService.class));
+        // If disabled, disable filtering as well
+        SharedPreferences.Editor editor = sharedPreferences.edit();
+        editor.putBoolean(getString(R.string.pref_enabled), enabled);
+        editor.commit();
+        application.setFilteringEnabled(false);
+        application.stopEngine(false);
+      }
+    }
     if (getString(R.string.pref_refresh).equals(key))
     {
       int refresh = Integer.valueOf(sharedPreferences.getString(key, "0"));
       findPreference(getString(R.string.pref_wifirefresh)).setEnabled(refresh > 0);
     }
     if (getString(R.string.pref_crashreport).equals(key))
     {
       boolean report = sharedPreferences.getBoolean(key, getResources().getBoolean(R.bool.def_crashreport));
       try
       {
@@ skipping 111 matching lines @@
       Log.d(TAG, "Proxy service connected");
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }