Create a minimal settings UI

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 26 matching lines @@
   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;
 
   static
   {
-    HANDLER_THREAD = new HandlerThread("adblockbrowser-addon-bridge");
+    HANDLER_THREAD = new HandlerThread("abp-bridge");
     HANDLER_THREAD.setDaemon(true);
     HANDLER_THREAD.start();
     HANDLER = new Handler(HANDLER_THREAD.getLooper());
   }
 
-  public static boolean getBooleanFromJSObject(final NativeJSObject obj, final String name,
+  public static boolean getBooleanFromJsObject(final NativeJSObject obj, final String name,
       final boolean defaultValue)
   {
     try
     {
       return obj.getBoolean(name);
     }
     catch (final Exception e)
     {
       return defaultValue;
     }
   }
 
-  public static String getStringFromJSObject(final NativeJSObject obj, final String name,
+  public static String getStringFromJsObject(final NativeJSObject obj, final String name,
       final String defaultValue)
   {
     try
     {
       return obj.getString(name);
     }
     catch (final Exception e)
     {
       return defaultValue;
     }
@@ skipping 22 matching lines @@
       obj.put("enable", enable);
     }
     catch (JSONException e)
     {
       // we're only adding sane objects
       Log.e(TAG, "Creating request data failed with: " + e.getMessage(), e);
     }
     return obj;
   }
 
-  public static void queryBoolean(final AdblockPlusApiCallback callback, final String action)
-  {
-    Log.d(TAG, "queryBoolean for " + action);
+  public static String makeFirstCharacterUppercase(String str)
+  {
+    if (Character.isUpperCase(str.charAt(0)))
+    {
+      return str;
+    }
+    return Character.toString(Character.toUpperCase(str.charAt(0))) + str.substring(1);
+  }
+
+  public static void queryBoolean(final AdblockPlusApiCallback callback, final String name)
+  {
+    Log.d(TAG, "queryBoolean for " + name);
     GeckoAppShell.sendRequestToGecko(
         new ChainedRequest(
-            createRequestData(action),
+            createRequestData("get" + makeFirstCharacterUppercase(name)),
             callback));
   }
 
-  public static void setBoolean(final AdblockPlusApiCallback callback, final String action,
+  public static void setBoolean(final AdblockPlusApiCallback callback, final String name,
       final boolean enable)
   {
-    Log.d(TAG, "setBoolean " + enable + " for " + action);
+    Log.d(TAG, "setBoolean " + enable + " for " + name);
     GeckoAppShell.sendRequestToGecko(
         new ChainedRequest(
-            createRequestData(action, enable),
+            createRequestData("set" + makeFirstCharacterUppercase(name), enable),
             callback));
   }
 
   private static class ChainedRequest extends GeckoRequest
   {
     private final JSONObject value;
     private final AdblockPlusApiCallback apiCallback;
-    private final boolean initCheck;
+    private final boolean checkForFiltersLoaded;
     private final long creationTime;
 
     public ChainedRequest(final JSONObject value, final AdblockPlusApiCallback callback,
-        final boolean checkInitState, final long creationTime)
+        final boolean checkForFiltersLoaded, final long creationTime)
     {
       super(AddOnBridge.REQUEST_NAME,
-          checkInitState ? createRequestData("getFiltersLoaded") : value);
+          checkForFiltersLoaded ? createRequestData("getFiltersLoaded") : value);
       this.value = value;
       this.apiCallback = callback;
-      this.initCheck = checkInitState;
+      this.checkForFiltersLoaded = checkForFiltersLoaded;
       this.creationTime = creationTime;
     }
 
     public ChainedRequest(final JSONObject value, final AdblockPlusApiCallback callback)
     {
       this(value, callback, true, System.currentTimeMillis());
     }
 
     public ChainedRequest cloneForRetry()
     {
       return new ChainedRequest(this.value, this.apiCallback, true, this.creationTime);
     }
 
     public ChainedRequest cloneForRequest()
     {
       return new ChainedRequest(this.value, this.apiCallback, false, this.creationTime);
     }
 
-    private void callSuccessFunction(final NativeJSObject jsObject)
+    private void invokeSuccessCallback(final NativeJSObject jsObject)
     {
       try
       {
         if (this.apiCallback != null)
         {
           this.apiCallback.onApiRequestSucceeded(jsObject);
         }
       }
       catch (final Exception e)
       {
         Log.e(TAG, "onApiRequestSucceeded threw exception: " + e.getMessage(), e);
       }
     }
 
-    private void callFailureFunction(final String msg)
+    private void invokeFailureCallback(final String msg)
     {
       if (this.apiCallback != null)
       {
         this.apiCallback.onApiRequestFailed(msg);
       }
     }
 
-    private void callFailureFunction(final NativeJSObject jsObject)
-    {
-      callFailureFunction(getStringFromJSObject(jsObject, "error", "unknown error"));
-    }
-
-    private void maybeRetry()
+    private void invokeFailureCallback(final NativeJSObject jsObject)
+    {
+      invokeFailureCallback(getStringFromJsObject(jsObject, "error", "unknown error"));
+    }
+
+    private void attemptRetry()
     {
       if (System.currentTimeMillis() - this.creationTime > (QUERY_GET_FILTERS_LOADED_TIMEOUT * 1000))
       {
-        this.callFailureFunction("getFiltersLoaded timeout");
+        this.invokeFailureCallback("getFiltersLoaded timeout");
       }
       else
       {
         final ChainedRequest next = this.cloneForRetry();
         HANDLER.postDelayed(new Runnable()
         {
           @Override
           public void run()
           {
             GeckoAppShell.sendRequestToGecko(next);
           }
         }, QUERY_GET_FILTERS_LOADED_DELAY);
       }
     }
 
     @Override
     public void onError()
     {
-      if (this.initCheck)
-      {
-        this.maybeRetry();
+      if (this.checkForFiltersLoaded)
+      {
+        this.attemptRetry();
       }
       else
       {
-        this.callFailureFunction("GeckoRequest error");
+        this.invokeFailureCallback("GeckoRequest error");
       }
     }
 
     @Override
     public void onResponse(final NativeJSObject jsObject)
     {
-      if (this.initCheck)
-      {
-        if (getBooleanFromJSObject(jsObject, "success", false)
-            && getBooleanFromJSObject(jsObject, "value", false))
+      if (this.checkForFiltersLoaded)
+      {
+        if (getBooleanFromJsObject(jsObject, "success", false)
+            && getBooleanFromJsObject(jsObject, "value", false))
         {
           GeckoAppShell.sendRequestToGecko(this.cloneForRequest());
         }
         else
         {
-          this.maybeRetry();
+          this.attemptRetry();
         }
       }
       else
       {
-        if (getBooleanFromJSObject(jsObject, "success", false))
-        {
-          this.callSuccessFunction(jsObject);
+        if (getBooleanFromJsObject(jsObject, "success", false))
+        {
+          this.invokeSuccessCallback(jsObject);
         }
         else
         {
-          this.callFailureFunction(jsObject);
+          this.invokeFailureCallback(jsObject);
         }
       }
     }
   }
 }