ABP/Android Proxy switch

src/org/adblockplus/android/AdblockPlus.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 210 matching lines @@
    * Checks if ProxyService is running.
    * 
    * @return true if service is running
    */
   public boolean isServiceRunning()
   {
     ActivityManager manager = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
     // Actually it returns not only running services, so extra check is required
     for (RunningServiceInfo service : manager.getRunningServices(Integer.MAX_VALUE))
     {
-      if ("org.adblockplus.android.ProxyService".equals(service.service.getClassName()) && service.pid > 0)

[Felix Dahlke, 2013/03/11 06:57:38]

How about ProxyService.getClass().getCanonicalName() (should work IIRC) instead
of hard coding this?

[Andrey Novikov, 2013/03/11 07:32:55]

ProxyService.class.getCanonicalName(), done

+      if (ProxyService.class.getCanonicalName().equals(service.service.getClassName()) && service.pid > 0)
         return true;
     }
     return false;
   }
 
   /**
    * Checks if application can write to external storage.
    */
   public boolean checkWriteExternalPermission()
   {
@@ skipping 668 matching lines @@
       jsEngine.callback(callback, params);
     }
 
     public final void stopEngine()
     {
       run = false;
       synchronized (queue)
       {
         queue.notify();
       }
-      System.gc();

[Felix Dahlke, 2013/03/11 06:57:38]

I think we shouldn't do this, won't help us work around the memory issue (will
explain that later).

[Andrey Novikov, 2013/03/11 07:32:55]

Done.

     }
 
     public void execute(Runnable r)
     {
       synchronized (queue)
       {
         queue.addLast(r);
         queue.notify();
       }
     }
@@ skipping 212 matching lines @@
       }
       return result;
     }
 
     protected void onProgressUpdate(Integer... progress)
     {
       Log.d("HTTP", "Progress: " + progress[0].intValue());
     }
   }
 }