Popup asking Tor users if they want to use the Observatory

pde · pde · commit e33b31be5b80 · 2011-07-17T16:36:05.000-07:00
Apologies for the creeping spaghetti this commit is feeding...
diff --git a/makexpi.sh b/makexpi.sh
@@ -62,7 +62,7 @@ rm -f "../$XPI_NAME"
 if [ -n "$CHANGES" ]; then
     printf >&2 "WARNING: uncommitted changes were included:\n%s\n" "$CHANGES"
 fi
-zip -v -X -9r "../$XPI_NAME" . "-x@../.build_exclusions"
+zip -q -X -9r "../$XPI_NAME" . "-x@../.build_exclusions"
 
 ret="$?"
 if [ "$ret" != 0 ]; then
diff --git a/src/chrome/content/observatory-popup.xul b/src/chrome/content/observatory-popup.xul
@@ -16,7 +16,7 @@
 
     <commandgroup>
       <command id="enable" oncommand="enable_observatory() ; popup_done()" />
-      <command id="nope" oncommand="popup_done()" />
+      <command id="nope" oncommand="disable_observatory() ; popup_done()" />
       <command id="later" oncommand="window.close()" />
       <command id="more-info" 
                oncommand='popup_done() ; 
diff --git a/src/chrome/content/observatory-preferences.js b/src/chrome/content/observatory-preferences.js
@@ -48,7 +48,7 @@ function observatory_prefs_init(doc) {
 // The user has responded to the popup in a final way; don't show it to them
 // again
 function popup_done() {
-  ssl_observatory.popup_responded = true;
+  obsprefs.setBoolPref("extensions.https_everywhere._observatory.popup_shown", true);
   window.close();
 }
 
@@ -111,6 +111,11 @@ function enable_observatory() {
   obsprefs.setBoolPref("extensions.https_everywhere._observatory.enabled", true);
 }
 
+function disable_observatory() {
+  // default but be sure...
+  obsprefs.setBoolPref("extensions.https_everywhere._observatory.enabled", false);
+}
+
 // called from within the prefs window, we have more work to do:
 function toggle_enabled() {
   var use_obs = document.getElementById("use-observatory").checked;
diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js
@@ -167,6 +167,7 @@ function HTTPSEverywhere() {
                     .getService(Components.interfaces.nsIObserverService);
   this.obsService.addObserver(this, "profile-before-change", false);
   this.obsService.addObserver(this, "profile-after-change", false);
+  this.obsService.addObserver(this, "sessionstore-windows-restored", false);
   return;
 }
 
@@ -430,6 +431,15 @@ HTTPSEverywhere.prototype = {
       // hook on redirections (non persistent, otherwise crashes on 1.8.x)
       catman.addCategoryEntry("net-channel-event-sinks", SERVICE_CTRID,
           SERVICE_CTRID, false, true);
+    } else if (topic == "sessionstore-windows-restored") {
+      var ssl_observatory = CC["@eff.org/ssl-observatory;1"]
+                        .getService(Components.interfaces.nsISupports)
+                        .wrappedJSObject;
+      // FIXME This prefs code is terrible spaghetti
+      var gbp = ssl_observatory.prefs.getBoolPref;
+      var shown = gbp("extensions.https_everywhere._observatory.popup_shown");
+      if (!shown && ssl_observatory.torbutton_installed) 
+        chrome_opener("chrome://https-everywhere/content/observatory-popup.xul");
     }
     return;
   },
@@ -553,6 +563,15 @@ HTTPSEverywhere.prototype = {
 
 };
 
+function chrome_opener(uri) {
+  // we don't use window.open, because we need to work around TorButton's 
+  // state control
+  CC['@mozilla.org/appshell/window-mediator;1']
+    .getService(CI.nsIWindowMediator) 
+    .getMostRecentWindow('navigator:browser')
+    .open(uri,'', 'chrome,centerscreen' );
+} 
+
 var prefs = 0;
 var econsole = 0;
 function https_everywhereLog(level, str) {
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -163,7 +163,11 @@ SSLObservatory.prototype = {
 
   // Wifi status listener
   onChange: function(accessPoints) {
-    var max_ap = accessPoints[0].mac;
+    try {
+      var max_ap = accessPoints[0].mac;
+    } catch(e) {
+      return null;  // accessPoints[0] is undefined
+    }
     var max_signal = accessPoints[0].signal;
     var old_max_present = false;
     for (var i=0; i<accessPoints.length; i++) {
diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js
@@ -13,6 +13,7 @@ pref("extensions.https_everywhere._observatory.submit_during_nontor",true);
 pref("extensions.https_everywhere._observatory.cache_submitted",true);
 
 pref("extensions.https_everywhere._observatory.use_custom_proxy",false);
+pref("extensions.https_everywhere._observatory.popup_shown",false);
 pref("extensions.https_everywhere._observatory.proxy_host","");
 pref("extensions.https_everywhere._observatory.proxy_port",0);
 pref("extensions.https_everywhere._observatory.proxy_type","direct");
