[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Do not register Stumbler listener at start up

[gk at torproject.org]

commit 2fd232288ac877e67fabf6c52ec1d85b87533446
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Wed Apr 25 01:55:44 2018 +0000

    Bug 25741 - TBA: Do not register Stumbler listener at start up
---
 mobile/android/base/java/org/mozilla/gecko/GeckoApp.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index 7e04484ac5bc..1f2f95490d0a 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -979,9 +979,12 @@ public abstract class GeckoApp extends GeckoActivity
         // Tell Stumbler to register a local broadcast listener to listen for preference intents.
         // We do this via intents since we can't easily access Stumbler directly,
         // as it might be compiled outside of Fennec.
-        getApplicationContext().sendBroadcast(
+        // TBA: We don't want Fennec using or receiving Stumbler
+        if (!AppConstants.isTorBrowser()) {
+            getApplicationContext().sendBroadcast(
                 new Intent(INTENT_REGISTER_STUMBLER_LISTENER)
-        );
+            );
+        }
 
         // Did the OS locale change while we were backgrounded? If so,
         // we need to die so that Gecko will re-init add-ons that touch
@@ -1025,6 +1028,7 @@ public abstract class GeckoApp extends GeckoActivity
             final String uri = getURIFromIntent(intent);
             if (!TextUtils.isEmpty(uri)) {
                 // Start a speculative connection as soon as Gecko loads.
+                // XXX TBA: Check this doesn't leak, and is blocked by Tor bootstrap
                 GeckoThread.speculativeConnect(uri);
             }
         }