Ensure that the Tor Browser checks proxy settings only after connecting to a circuit

Hainish · Hainish · commit c7df15106a04 · 2016-05-18T17:22:43.000-07:00
diff --git a/src/components/ssl-observatory.js b/src/components/ssl-observatory.js
@@ -128,7 +128,9 @@ function SSLObservatory() {
     this.log(WARN, "Failed to initialize NSS component:" + e);
   }
 
-  this.testProxySettings();
+  // It is necessary to testProxySettings after the window is loaded, since the
+  // Tor Browser will not be finished establishing a circuit otherwise
+  OS.addObserver(this, "browser-delayed-startup-finished", false);
 
   this.log(DBUG, "Loaded observatory component!");
 }
@@ -398,6 +400,10 @@ SSLObservatory.prototype = {
         }
       }
     }
+
+    if (topic == "browser-delayed-startup-finished") {
+      this.testProxySettings();
+    }
   },
 
   observatoryActive: function() {

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,9 @@ function SSLObservatory() {`
`128`	`128`	`this.log(WARN, "Failed to initialize NSS component:" + e);`
`129`	`129`	`}`
`130`	`130`
`131`		`- this.testProxySettings();`
	`131`	`+ // It is necessary to testProxySettings after the window is loaded, since the`
	`132`	`+ // Tor Browser will not be finished establishing a circuit otherwise`
	`133`	`+ OS.addObserver(this, "browser-delayed-startup-finished", false);`
`132`	`134`
`133`	`135`	`this.log(DBUG, "Loaded observatory component!");`
`134`	`136`	`}`
`@@ -398,6 +400,10 @@ SSLObservatory.prototype = {`
`398`	`400`	`}`
`399`	`401`	`}`
`400`	`402`	`}`
	`403`	`+`
	`404`	`+ if (topic == "browser-delayed-startup-finished") {`
	`405`	`+ this.testProxySettings();`
	`406`	`+ }`
`401`	`407`	`},`
`402`	`408`
`403`	`409`	`observatoryActive: function() {`