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 235 matching lines @@
         Log.d(LOGTAG, "BrowserApp.onTabChanged: " + tab.getId() + ": " + msg);
         switch(msg) {
             case LOCATION_CHANGE:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     maybeCancelFaviconLoad(tab);
                 }
                 // fall through
             case SELECTED:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     updateHomePagerForTab(tab);
+                    if (mMenu != null)
+                        org.adblockplus.browser.BrowserAppUtils.updateBlockAdsMenuItem(
+                            mMenu.findItem(R.id.block_ads));
                 }
                 break;
             case START:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     invalidateOptionsMenu();
 
                     if (mDynamicToolbar.isEnabled()) {
                         mDynamicToolbar.setVisible(true, VisibilityTransition.ANIMATE);
                     }
                 }
@@ skipping 286 matching lines @@
             "Feedback:MaybeLater",
             "Feedback:OpenPlayStore",
             "Menu:Add",
             "Menu:Remove",
             "Reader:ListStatusRequest",
             "Reader:Removed",
             "Reader:Share",
             "Settings:Show",
             "Telemetry:Gather",
             "Updater:Launch",
-            "BrowserToolbar:Visibility",
-            "BlockAds:Update");
+            "BrowserToolbar:Visibility");
 
         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",
-            "BlockAds:Update");
+            "BrowserToolbar:Visibility");
 
         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 374 matching lines @@
             Telemetry.HistogramAdd("FENNEC_THUMBNAILS_COUNT",
                     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 869 matching lines @@
         }
 
         return null;
     }
 
     /**
      * Add the provided item to the provided menu, which should be
      * the root (mMenu).
      */
     private void addAddonMenuItemToMenu(final Menu menu, final MenuItemInfo info) {
+        // Adblock Browser doesn't support add-ons, so the only menu item that
+        // could be added is the one for whitelisting the current domain added
+        // by ABP - Adblock Browser has its own item for that.
+        if (true)
+            return;
+
         info.added = true;
 
         final Menu destination;
         if (info.parent == 0) {
             destination = menu;
         } else if (info.parent == GECKO_TOOLS_MENU) {
             MenuItem tools = menu.findItem(R.id.tools);
             destination = tools != null ? tools.getSubMenu() : menu;
         } else {
             MenuItem parent = menu.findItem(info.parent);
@@ skipping 139 matching lines @@
                 addAddonMenuItemToMenu(mMenu, item);
             }
         }
 
         // Action providers are available only ICS+.
         if (Versions.feature14Plus) {
             GeckoMenuItem share = (GeckoMenuItem) mMenu.findItem(R.id.share);
             GeckoActionProvider provider = GeckoActionProvider.getForType(GeckoActionProvider.DEFAULT_MIME_TYPE, this);
             share.setActionProvider(provider);
         }
+
+        org.adblockplus.browser.BrowserAppUtils.updateBlockAdsMenuItem(
+            mMenu.findItem(R.id.block_ads));
 
         return true;
     }
 
     @Override
     public void openOptionsMenu() {
         // Disable menu access (for hardware buttons) when the software menu button is inaccessible.
         if (mBrowserToolbar.isEditing()) {
             return;
         }
@@ skipping 324 matching lines @@
                 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()));
+            org.adblockplus.browser.BrowserAppUtils.updateCurrentTabWhitelisting(item);
             return true;
         }
 
         if (itemId == R.id.new_tab) {
             addTab();
             return true;
         }
 
         if (itemId == R.id.new_private_tab) {
             addPrivateTab();
@@ skipping 371 matching lines @@
                                                   final SessionInformation previousSession) {
         return new BrowserHealthRecorder(context,
                                          GeckoSharedPrefs.forApp(context),
                                          profilePath,
                                          dispatcher,
                                          osLocale,
                                          appLocale,
                                          previousSession);
     }
 }