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

mobile/android/base/BrowserApp.java

 /* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.mozilla.gecko;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.lang.reflect.Method;
@@ skipping 541 matching lines @@
             "Feedback:MaybeLater",
             "Feedback:OpenPlayStore",
             "Menu:Add",
             "Menu:Remove",
             "Reader:ListStatusRequest",
             "Reader:Removed",
             "Reader:Share",
             "Settings:Show",
             "Telemetry:Gather",
             "Updater:Launch",
-            "BrowserToolbar:Visibility");
+            "BrowserToolbar:Visibility",
+            "BlockAds:Update");
 
         Distribution distribution = Distribution.init(this);
 
         // Init suggested sites engine in BrowserDB.
         final SuggestedSites suggestedSites = new SuggestedSites(appContext, distribution);
         BrowserDB.setSuggestedSites(suggestedSites);
 
         JavaAddonManager.getInstance().init(appContext);
         mSharedPreferencesHelper = new SharedPreferencesHelper(appContext);
         mOrderedBroadcastHelper = new OrderedBroadcastHelper(appContext);
@@ skipping 417 matching lines @@
             "Feedback:MaybeLater",
             "Feedback:OpenPlayStore",
             "Menu:Add",
             "Menu:Remove",
             "Reader:ListStatusRequest",
             "Reader:Removed",
             "Reader:Share",
             "Settings:Show",
             "Telemetry:Gather",
             "Updater:Launch",
-            "BrowserToolbar:Visibility");
+            "BrowserToolbar:Visibility",
+            "BlockAds:Update");
 
         if (AppConstants.MOZ_ANDROID_BEAM) {
             NfcAdapter nfc = NfcAdapter.getDefaultAdapter(this);
             if (nfc != null) {
                 // null this out even though the docs say it's not needed,
                 // because the source code looks like it will only do this
                 // automatically on API 14+
                 nfc.setNdefPushMessageCallback(null, this);
             }
         }
@@ skipping 375 matching lines @@
                     BrowserDB.getCount(getContentResolver(), "thumbnails"));
             Telemetry.HistogramAdd("FENNEC_READING_LIST_COUNT",
                     BrowserDB.getCount(getContentResolver(), "readinglist"));
             Telemetry.HistogramAdd("BROWSER_IS_USER_DEFAULT", (isDefaultBrowser() ? 1 : 0));
         } else if ("Updater:Launch".equals(event)) {
             handleUpdaterLaunch();
 
         } else if ("BrowserToolbar:Visibility".equals(event)) {
             setBrowserToolbarVisible(message.getBoolean("visible"));
 
+        } else if ("BlockAds:Update".equals(event)) {
+            final Menu menu = mMenu;
+            final boolean enabled = message.getBoolean("canBlockAds");
+            final boolean checked = message.getBoolean("blockAds");
+            ThreadUtils.postToUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (menu == null)
+                            return;
+                        final MenuItem blockAdsItem = menu.findItem(R.id.block_ads);
+                        blockAdsItem.setEnabled(enabled);
+                        blockAdsItem.setChecked(checked);
+                    }
+                });
+
+
         } else {
             super.handleMessage(event, message, callback);
         }
     }
 
     /**
      * Use a dummy Intent to do a default browser check.
      *
      * @return true if this package is the default browser on this device, false otherwise.
      */
@@ skipping 1370 matching lines @@
             try {
                 args.put("desktopMode", !item.isChecked());
                 args.put("tabId", selectedTab.getId());
             } catch (JSONException e) {
                 Log.e(LOGTAG, "error building json arguments");
             }
             GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("DesktopMode:Change", args.toString()));
             return true;
         }
 
+        if (itemId == R.id.block_ads) {
+            Tab selectedTab = Tabs.getInstance().getSelectedTab();
+            if (selectedTab == null)
+                return true;
+            JSONObject args = new JSONObject();
+            try {
+                args.put("blockAds", !item.isChecked());
+                args.put("url", selectedTab.getURL());
+            } catch (JSONException e) {
+                Log.e(LOGTAG, "error building json arguments");
+            }
+            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("BlockAds:Change", args.toString()));
+            return true;
+        }
+
         if (itemId == R.id.new_tab) {
             addTab();
             return true;
         }
 
         if (itemId == R.id.new_private_tab) {
             addPrivateTab();
             return true;
         }
 
@@ skipping 368 matching lines @@
                                                   final SessionInformation previousSession) {
         return new BrowserHealthRecorder(context,
                                          GeckoSharedPrefs.forApp(context),
                                          profilePath,
                                          dispatcher,
                                          osLocale,
                                          appLocale,
                                          previousSession);
     }
 }