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 215 matching lines @@
  */
 let notificationTimer = null;
 
 let UI = exports.UI =
 {
   /**
    * Gets called on startup, initializes UI integration.
    */
   init: function()
   {
-    try
-    {
-      ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null);

[saroyanm, 2014/04/25 12:08:06]

Not sure if we need this here ?

-    }
-    catch (e)
-    {
-      // No built-in CustomizableUI API, use our own implementation.
-      ({CustomizableUI}) = require("customizableUI");
-    }

[Wladimir Palant, 2014/04/25 12:39:54]

This doesn't resolve the circular reference. The modules load like this: ui =>
customizableUI => appSupport => ui. The original issue was that the ui module
didn't set exports.UI yet when appSupport loaded. Moving code around left the
circular reference but appSupport loads a bit later, when exports.UI is already
set.

Thing is: we don't even need CustomizableUI in Firefox Mobile, there is no
toolbar icon there. So I suggest you move CustomizableUI initialization into
UI.initDone(), inside the |if ("abp-toolbarbutton" in this.overlay &&
defaultToolbarPosition)| block. This way it won't be loaded if there is no
toolbar button.

[saroyanm, 2014/04/25 14:04:22]

Thanks for descriptive comment.
Done.

-    
     // We should call initDone once both overlay and filters are loaded
     let overlayLoaded = false;
     let filtersLoaded = false;
     let sessionRestored = false;
 
     // Start loading overlay
     let request = new XMLHttpRequest();
     request.mozBackgroundRequest = true;
     request.open("GET", "chrome://adblockplus/content/ui/overlay.xul");
     request.addEventListener("load", function(event)
@@ skipping 115 matching lines @@
    */
   initDone: function()
   {
     let {WindowObserver} = require("windowObserver");
     new WindowObserver(this);
 
     // Add toolbar icon
     let {defaultToolbarPosition} = require("appSupport");
     if ("abp-toolbarbutton" in this.overlay && defaultToolbarPosition)
     {
+      try
+      {
+        ({CustomizableUI}) = Cu.import("resource:///modules/CustomizableUI.jsm", null);
+      }
+      catch (e)
+      {
+        // No built-in CustomizableUI API, use our own implementation.
+        ({CustomizableUI}) = require("customizableUI");
+      }
+      
       CustomizableUI.createWidget({
         id: "abp-toolbarbutton",
         type: "custom",
         positionAttribute: "abp-iconposition",        // For emulation only
         defaultArea: defaultToolbarPosition.parent,
         defaultBefore: defaultToolbarPosition.before, // For emulation only
         defaultAfter: defaultToolbarPosition.after,   // For emulation only
         removable: true,
         onBuild: function(document)
         {
@@ skipping 602 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);
 });