ABP/Android libadblockplus integration

src/org/adblockplus/android/AdvancedPreferences.java

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 109 matching lines @@
   }
 
   @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)
+      if (enabled)
       {
-        startService(new Intent(this, ProxyService.class));
+        if (!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.putBoolean(getString(R.string.pref_enabled), false);
         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));
@@ skipping 113 matching lines @@
       Log.d(TAG, "Proxy service connected");
     }
 
     public void onServiceDisconnected(ComponentName className)
     {
       proxyService = null;
       Log.d(TAG, "Proxy service disconnected");
     }
   };
 }