Fix reference to missing gBrowser on Android.

jsha · jsha · commit 31f5adea197c · 2014-12-08T18:07:26.000-08:00
diff --git a/makexpi.sh b/makexpi.sh
@@ -167,6 +167,7 @@ else
   echo >&2 "Total included rules: `sqlite3 $RULESETS_SQLITE 'select count(*) from rulesets'`"
   echo >&2 "Rules disabled by default: `find chrome/content/rules -name "*.xml" | xargs grep -F default_off | wc -l`"
   echo >&2 "Created $XPI_NAME"
+  ../utils/android-push.sh "$XPI_NAME"
   if [ -n "$BRANCH" ]; then
     cd ../..
     cp $SUBDIR/$XPI_NAME pkg
diff --git a/src/chrome/content/code/HTTPSRules.js b/src/chrome/content/code/HTTPSRules.js
@@ -1,3 +1,4 @@
+const Cc = Components.classes;
 // Compilation of RegExps is now delayed until they are first used...
 
 function Rule(from, to) {
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -355,15 +355,29 @@ HTTPSEverywhere.prototype = {
         .getInterface(Ci.nsIDOMWindow);
       // this is the gBrowser object of the firefox window this tab is in
       var gBrowser = aDOMWindow.gBrowser;
-      // this is the clickable tab xul element, the one found in the tab strip
-      // of the firefox window, aTab.linkedBrowser is same as browser var above
-      var aTab = gBrowser._getTabForContentWindow(contentWindow.top);
-      // this is the browser within the tab
-      if (aTab) {
-        var browser = aTab.linkedBrowser;
-        return browser;
+      // On Firefox for Android, gBrowser is not available. Instead use the
+      // BrowserApp API:
+      // https://developer.mozilla.org/en-US/Add-ons/Firefox_for_Android/API/BrowserApp
+      if (gBrowser) {
+        var aTab = gBrowser._getTabForContentWindow(contentWindow.top);
+        // this is the clickable tab xul element, the one found in the tab strip
+        // of the firefox window, aTab.linkedBrowser is same as browser var above
+        // this is the browser within the tab
+        if (aTab) {
+          var browser = aTab.linkedBrowser;
+          return browser;
+        } else {
+          this.log(NOTE, "getBrowserForChannel: aTab was null.");
+        }
       } else {
-        this.log(NOTE, "getBrowserForChannel: aTab was null.");
+        // This code gets called on Android.
+        var mTab = aDOMWindow.BrowserApp.getTabForWindow(contentWindow.top);
+        if (mTab) {
+          var browser = mTab.browser;
+          return browser;
+        } else {
+          this.log(NOTE, "getBrowserForChannel: mTab was null");
+        }
       }
     } else {
       this.log(NOTE, "getBrowserForChannel: No loadContext for: " +
diff --git a/utils/android-push.sh b/utils/android-push.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -o errexit
+
+cd $(dirname $0)
+XPI_NAME=$1
+ANDROID_APP_ID=org.mozilla.firefox
+if [ -z "$XPI_NAME" ] ; then
+  echo "No package name given to android-push.sh."
+  exit 1
+fi
+
+# Push to Android Firefox if device is connected
+# XXX on some systems, adb may require sudo...
+if type adb > /dev/null && adb devices > /dev/null 2>/dev/null ; then
+  ADB_FOUND=`adb devices | tail -2 | head -1 | cut -f 1 | sed 's/ *$//g'`
+  if [ "$ADB_FOUND" != "List of devices attached" ]; then
+    echo Pushing "$XPI_NAME" to /sdcard/"$XPI_NAME"
+    adb push "../$XPI_NAME" /sdcard/"$XPI_NAME"
+    adb shell am start -a android.intent.action.VIEW \
+                       -c android.intent.category.DEFAULT \
+                       -d file:///mnt/sdcard/"$XPI_NAME" \
+                       -n $ANDROID_APP_ID/.App
+  fi
+fi
+
+

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+const Cc = Components.classes;`
`1`	`2`	`// Compilation of RegExps is now delayed until they are first used...`
`2`	`3`
`3`	`4`	`function Rule(from, to) {`