Issue 2351 - Add a custom menu item for whitelisting the current site

mobile/android/thirdparty/org/adblockplus/browser/BrowserAppUtils.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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.adblockplus.browser;

[René Jeschke, 2015/05/06 10:56:33]

I added a copyright header to all new sources, should we make it mandatory?

[Felix Dahlke, 2015/05/06 16:42:50]

Done.

 
 import android.util.Log;
 import android.view.MenuItem;
 
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.util.NativeJSObject;
 import org.mozilla.gecko.util.ThreadUtils;
 
 public class BrowserAppUtils

[René Jeschke, 2015/05/06 10:56:33]

Just a nit and a matter of taste, I guess:

I tend to add a private, empty constructor to classes that are singletons by
design, to prevent any abuse or the like.

[Felix Dahlke, 2015/05/06 16:42:50]

Done.

 {
   private static final String TAG = "AdblockBrowser.BrowserAppUtils";
 
   public static void updateBlockAdsMenuItem(final MenuItem item)
   {
     final Tab selectedTab = Tabs.getInstance().getSelectedTab();
     if (selectedTab == null)
       return;
     final String url = selectedTab.getURL();

[René Jeschke, 2015/05/06 10:56:33]

Nit: A newline (before L20) would improve readability here, same for (before)
L41 and L68.

[Felix Dahlke, 2015/05/06 16:42:50]

Done.

+
     AddOnBridge.queryIsLocal(new AdblockPlusApiCallback()
     {
       @Override
       public void onApiRequestSucceeded(NativeJSObject jsObject)
       {
         final boolean local = AddOnBridge.getBooleanFromJsObject(jsObject, "value", true);
-        ThreadUtils.postToUiThread(new Runnable() {

[René Jeschke, 2015/05/06 10:56:33]

We are still using Allman bracing style in code that is written by us :D, also
see below

[Felix Dahlke, 2015/05/06 16:42:50]

Done.

+        ThreadUtils.postToUiThread(new Runnable()
+        {
           @Override
-          public void run() {
+          public void run()
+          {
             item.setEnabled(!local);
           }
         });
       }
 
       @Override
       public void onApiRequestFailed(String errorMessage)
       {
         Log.e(TAG, "queryIsLocal failed: " + errorMessage);
       }
     }, url);
+
     AddOnBridge.queryIsPageWhitelisted(new AdblockPlusApiCallback()
     {
       @Override
       public void onApiRequestSucceeded(NativeJSObject jsObject)
       {
         final boolean whitelisted = AddOnBridge.getBooleanFromJsObject(jsObject, "value", false);
-        ThreadUtils.postToUiThread(new Runnable() {
+        ThreadUtils.postToUiThread(new Runnable()
+        {
           @Override
-          public void run() {
+          public void run()
+          {
             item.setChecked(!whitelisted);
           }
         });
       }
 
       @Override
       public void onApiRequestFailed(String errorMessage)
       {
         Log.e(TAG, "queryIsPageWhitelisted failed: " + errorMessage);
       }
     }, url);
   }
 
   public static void updateCurrentTabWhitelisting(final MenuItem item)
   {
     final Tab selectedTab = Tabs.getInstance().getSelectedTab();
     if (selectedTab == null)
       return;
     final String url = selectedTab.getURL();
+
     AddOnBridge.whitelistSite(new AdblockPlusApiCallback()
     {
       @Override
       public void onApiRequestSucceeded(NativeJSObject jsObject)
       {
-        ThreadUtils.postToUiThread(new Runnable() {
+        ThreadUtils.postToUiThread(new Runnable()
+        {
           @Override
-          public void run() {
+          public void run()
+          {
             selectedTab.doReload();
           }
         });
       }
 
       @Override
       public void onApiRequestFailed(String errorMessage)
       {
         Log.e(TAG, "whitelistSite failed: " + errorMessage);
       }
     }, url, item.isChecked());
   }
+
+  private BrowserAppUtils()
+  {
+    // Shouldn't be instantiated.
+  }
 }