First run page and subscription on install fix (FF for android)

lib/ui.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 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 14 matching lines @@
 let {FilterStorage} = require("filterStorage");
 let {FilterNotifier} = require("filterNotifier");
 let {RequestNotifier} = require("requestNotifier");
 let {Filter} = require("filterClasses");
 let {Subscription, SpecialSubscription, DownloadableSubscription} = require("subscriptionClasses");
 let {Synchronizer} = require("synchronizer");
 let {KeySelector} = require("keySelector");
 let {Notification} = require("notification");
 let {initAntiAdblockNotification} = require("antiadblockInit");
 
-let CustomizableUI;
+let CustomizableUI = null;
 
 /**
  * Filter corresponding with "disable on site" menu item (set in fillIconMent()).
  * @type Filter
  */
 let siteWhitelist = null;
 /**
  * Filter corresponding with "disable on site" menu item (set in fillIconMenu()).
  * @type Filter
  */
@@ skipping 86 matching lines @@
       {
         this.value = UI.toggleAcceptableAds();
       });
 
       setChecked("adblockplus-sync", syncEngine && syncEngine.enabled);
       addCommandHandler("adblockplus-sync", function()
       {
         this.value = UI.toggleSync();
       });
 
-      if (hasToolbar)
-      {
-        setChecked("adblockplus-showintoolbar", UI.isToolbarIconVisible());
-        addCommandHandler("adblockplus-showintoolbar", function()
-        {
-          UI.toggleToolbarIcon();
-          this.value = UI.isToolbarIconVisible();
-        });
-      }

[Wladimir Palant, 2014/04/25 14:32:19]

Same change would have to be done in fillIconMenu() as well. IMHO it is safer to
change isToolbarIconVisible() and toggleToolbarIcon() to check whether
CustomizableUI is set - that way future introducing new callers to these
functions won't break for non-obvious reasons.

[saroyanm, 2014/04/25 15:10:22]

Good point, thanks.

+      setChecked("adblockplus-showintoolbar", UI.isToolbarIconVisible());
+      addCommandHandler("adblockplus-showintoolbar", function()
+      {
+        UI.toggleToolbarIcon();
+        this.value = UI.isToolbarIconVisible();
+      });
 
       let list = doc.getElementById("adblockplus-subscription-list");
       if (list)
       {
         // Load subscriptions data
         let request = new XMLHttpRequest();
         request.mozBackgroundRequest = true;
         request.open("GET", "chrome://adblockplus/content/ui/subscriptions.xml");
         request.addEventListener("load", function()
         {
@@ skipping 870 matching lines @@
     }
 
     return [parent, before];
   },
 
   /**
    * Toggles visibility state of the toolbar icon.
    */
   toggleToolbarIcon: function()
   {
+    if (!CustomizableUI)
+      return;
     if (this.isToolbarIconVisible())
       CustomizableUI.removeWidgetFromArea("abp-toolbarbutton");
     else
     {
       let {defaultToolbarPosition} = require("appSupport");
       CustomizableUI.addWidgetToArea("abp-toolbarbutton", defaultToolbarPosition.parent);
     }
   },
 
   /**
@@ skipping 654 matching lines @@
           command.doCommand();
       }
     }
   },
 
   /**
    * Checks whether the toolbar icon is currently displayed.
    */
   isToolbarIconVisible: function() /**Boolean*/
   {
+    if (!CustomizableUI)
+      return false;
     let placement = CustomizableUI.getPlacementOfWidget("abp-toolbarbutton");
     return !!placement;
   },
 
   /**
    * Stores the selected hotkeys, initialized when the user presses a key.
    */
   hotkeys: null,
 
   /**
@@ skipping 191 matching lines @@
   ["abp-command-contribute", "command", UI.openContributePage.bind(UI)],
   ["abp-command-contribute-hide", "command", UI.hideContributeButton.bind(UI)]
 ];
 
 onShutdown.add(function()
 {
   for (let window in UI.applicationWindows)
     if (UI.isBottombarOpen(window))
       UI.toggleBottombar(window);
 });