Issue 2720 - [Adblocking settings] Add the other filter lists category

mobile/android/thirdparty/org/adblockplus/browser/AddOnBridge.java

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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 24 matching lines @@
 public class AddOnBridge
 {
   private static final String TAG = "AdblockBrowser.AddOnBridge";
   private static final String REQUEST_NAME = "AdblockPlus:Api";
   // Timeout for checking filter loading (in seconds)
   private static final int QUERY_GET_FILTERS_LOADED_TIMEOUT = 30;
   // How long to wait between retries (in milliseconds)
   private static final int QUERY_GET_FILTERS_LOADED_DELAY = 500;
   // Handler+HandlerThread for posting delayed re-tries without interfering with
   // other threads (e.g. the UI or Gecko thread)
-  private static final HandlerThread HANDLER_THREAD;
-  private static final Handler HANDLER;
+  private static final HandlerThread PRIVATE_HANDLER_THREAD;
+  private static final Handler PRIVATE_HANDLER;
+  // Global handler, for e.g. UI tasks
+  private static final HandlerThread GLOBAL_HANDLER_THREAD;
+  private static final Handler GLOBAL_HANDLER;
 
   static
   {
-    HANDLER_THREAD = new HandlerThread("abp-bridge");
-    HANDLER_THREAD.setDaemon(true);
-    HANDLER_THREAD.start();
-    HANDLER = new Handler(HANDLER_THREAD.getLooper());
+    PRIVATE_HANDLER_THREAD = new HandlerThread("abp-private-handler");
+    PRIVATE_HANDLER_THREAD.setDaemon(true);
+    PRIVATE_HANDLER_THREAD.start();
+    PRIVATE_HANDLER = new Handler(PRIVATE_HANDLER_THREAD.getLooper());
+
+    GLOBAL_HANDLER_THREAD = new HandlerThread("abp-global-handler");
+    GLOBAL_HANDLER_THREAD.setDaemon(true);
+    GLOBAL_HANDLER_THREAD.start();
+    GLOBAL_HANDLER = new Handler(GLOBAL_HANDLER_THREAD.getLooper());
+  }
+
+  public static void postToHandler(Runnable runnable)
+  {
+    GLOBAL_HANDLER.post(runnable);
+  }
+
+  public static void postToHandlerDelayed(Runnable runnable, long delayMillis)
+  {
+    GLOBAL_HANDLER.postDelayed(runnable, delayMillis);
   }
 
   public static boolean getBooleanFromJsObject(final NativeJSObject obj, final String name,
       final boolean defaultValue)
   {
     try
     {
       return obj.getBoolean(name);
     }
     catch (final Exception e)
@@ skipping 98 matching lines @@
     parameters.put("url", url);
     callFunction(callback, "isSubscriptionListed", parameters);
   }
 
   public static void addSubscription(final AdblockPlusApiCallback callback,
       final String url, final String title)
   {
     Log.d(TAG, "addSubscription for " + url + " (" + title + ")");
     final Map<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("url", url);
-    parameters.put("title", title);
+    if (title != null)
+    {
+      parameters.put("title", title);
+    }
     callFunction(callback, "addSubscription", parameters);
   }
 
+  public static void queryActiveSubscriptions(final AdblockPlusApiCallback callback)
+  {
+    Log.d(TAG, "queryActiveSubscriptions");
+    final Map<String, Object> parameters = new HashMap<String, Object>();
+    callFunction(callback, "getActiveSubscriptions", parameters);
+  }
+
   public static void removeSubscription(final AdblockPlusApiCallback callback,
       final String url)
   {
     Log.d(TAG, "removeSubscription for " + url);
     final Map<String, Object> parameters = new HashMap<String, Object>();
     parameters.put("url", url);
     callFunction(callback, "removeSubscription", parameters);
   }
 
   public static void queryIsLocal(final AdblockPlusApiCallback callback,
@@ skipping 88 matching lines @@
     private void attemptRetry()
     {
       if (System.currentTimeMillis() - this.creationTime > (QUERY_GET_FILTERS_LOADED_TIMEOUT * 1000))
       {
         this.invokeFailureCallback("getFiltersLoaded timeout");
       }
       else
       {
         Log.d(TAG, "Retrying: " + this.value);
         final ChainedRequest next = this.cloneForRetry();
-        HANDLER.postDelayed(new Runnable()
+        PRIVATE_HANDLER.postDelayed(new Runnable()
         {
           @Override
           public void run()
           {
             GeckoAppShell.sendRequestToGecko(next);
           }
         }, QUERY_GET_FILTERS_LOADED_DELAY);
       }
     }
 
@@ skipping 34 matching lines @@
           this.invokeSuccessCallback(jsObject);
         }
         else
         {
           this.invokeFailureCallback(jsObject);
         }
       }
     }
   }
 }