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

[gk at torproject.org]

commit cee7a826fa47d7155ac902f093b6f7c07a4c0e55
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 | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
index 4f09e065c0c3..246ce55d0d23 100644
--- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java
@@ -96,7 +96,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.mozilla.geckoview.GeckoViewBridge;
-import org.mozilla.mozstumbler.service.mainthread.SafeReceiver;
+// SafeReceiver excluded at compile-time
+//import org.mozilla.mozstumbler.service.mainthread.SafeReceiver;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -1008,9 +1009,13 @@ 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.
-        final Intent stumblerIntent = new Intent(getApplicationContext(), SafeReceiver.class);
-        stumblerIntent.setAction(INTENT_REGISTER_STUMBLER_LISTENER);
-        getApplicationContext().sendBroadcast(stumblerIntent);
+        // Tor Browser: We don't want Fennec using or receiving Stumbler
+        // SafeReceiver excluded at compile-time
+        //if (!AppConstants.isTorBrowser()) {
+        //    final Intent stumblerIntent = new Intent(getApplicationContext(), SafeReceiver.class);
+        //    stumblerIntent.setAction(INTENT_REGISTER_STUMBLER_LISTENER);
+        //    getApplicationContext().sendBroadcast(stumblerIntent);
+        //}
 
         // 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
@@ -1071,6 +1076,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);
             }
         }