Issue 5587, 5748 - Use mobile options page on Firefox for Android

ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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 315 matching lines @@
     _applyChanges()
     {
       if ("iconPath" in this._changes)
       {
         // Firefox for Android displays the browser action not as an icon but
         // as a menu item. There is no icon, but such an option may be added in
         // the future.
         // https://bugzilla.mozilla.org/show_bug.cgi?id=1331746
         if ("setIcon" in chrome.browserAction)
         {
-          chrome.browserAction.setIcon({
-            tabId: this._tabId,
-            path: {
-              16: this._changes.iconPath.replace("$size", "16"),
-              19: this._changes.iconPath.replace("$size", "19"),
-              20: this._changes.iconPath.replace("$size", "20"),
-              32: this._changes.iconPath.replace("$size", "32"),
-              38: this._changes.iconPath.replace("$size", "38"),
-              40: this._changes.iconPath.replace("$size", "40")
-            }
-          });
+          let path = {
+            16: this._changes.iconPath.replace("$size", "16"),
+            19: this._changes.iconPath.replace("$size", "19"),
+            20: this._changes.iconPath.replace("$size", "20"),
+            32: this._changes.iconPath.replace("$size", "32"),
+            38: this._changes.iconPath.replace("$size", "38"),
+            40: this._changes.iconPath.replace("$size", "40")
+          };
+          try
+          {
+            chrome.browserAction.setIcon({tabId: this._tabId, path});
+          }
+          catch (e)
+          {
+            // Edge throws if passed icon sizes different than 19,20,38,40px.
+            delete path[16];
+            delete path[32];
+            chrome.browserAction.setIcon({tabId: this._tabId, path});
+          }
         }
       }
 
       if ("badgeText" in this._changes)
       {
         // There is no badge on Firefox for Android; the browser action is
         // simply a menu item.
         if ("setBadgeText" in chrome.browserAction)
         {
           chrome.browserAction.setBadgeText({
@@ skipping 321 matching lines @@
       items[key] = value;
       chrome.storage.local.set(items, callback);
     },
     remove(key, callback)
     {
       chrome.storage.local.remove(key, callback);
     },
     onChanged: chrome.storage.onChanged
   };
 
-  /* Options */
-
-  ext.showOptions = callback =>
-  {
-    let info = require("info");
-
-    if ("openOptionsPage" in chrome.runtime &&
-        // We don't use runtime.openOptionsPage on Firefox for Android because
-        // we have a different options page for mobile.
-        info.application != "fennec")
-    {
-      if (!callback)
-      {
-        chrome.runtime.openOptionsPage();
-      }
-      else
-      {
-        chrome.runtime.openOptionsPage(() =>
-        {
-          if (chrome.runtime.lastError)
-            return;
-
-          chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs =>
-          {
-            if (tabs.length > 0)
-            {
-              if (tabs[0].status == "complete")
-                callback(new Page(tabs[0]));
-              else
-                afterTabLoaded(callback)(tabs[0]);
-            }
-          });
-        });
-      }
-    }
-    else
-    {
-      // Edge does not yet support runtime.openOptionsPage (tested version 38)
-      let optionsUrl = "options.html";
-
-      // Firefox for Android has its own options page.

[Manish Jethani, 2017/09/08 10:46:45]

There's no need for this now.

-      if (info.application == "fennec")
-        optionsUrl = "mobile-options.html";
-
-      chrome.tabs.query({}, tabs =>
-      {
-        // We find a tab ourselves because Edge has a bug when quering tabs
-        // with extension URL protocol:
-        // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8094141/ 
-        // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/8604703/
-        // Firefox won't let us query for moz-extension:// pages either, though
-        // starting with Firefox 56 an extension can query for its own URLs:
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=1271354
-        let fullOptionsUrl = ext.getURL(optionsUrl);
-        let tab = tabs.find(element => element.url == fullOptionsUrl);
-        if (tab)
-        {
-          // Firefox for Android doesn't support the windows API, and the
-          // mobile browser has only one window anyway.
-          if ("windows" in chrome)
-            chrome.windows.update(tab.windowId, {focused: true});
-
-          chrome.tabs.update(tab.id, {active: true});
-
-          if (callback)
-            callback(new Page(tab));
-        }
-        else
-        {
-          // We don't use fullOptionsUrl here because of this Edge issue:
-          // https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/10276332
-          ext.pages.open(optionsUrl, callback);
-        }
-      });
-    }
-  };
-
   /* Windows */
   ext.windows = {
     create(createData, callback)
     {
       chrome.windows.create(createData, createdWindow =>
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 }());