tor-browser

commit 61cf191bd3d559b38f4b67f8f99f819dd7c31fdc
parent ef0640a3024083e50008db82916d2547be3b5f74
Author: Pier Angelo Vendrame <pierov@torproject.org>
Date:   Wed, 25 Feb 2026 10:10:05 +0100

fixup! TB 42247: Android helpers for the TorProvider

TB 44635: Gather conflux information on circuits.

Update the getCircuit name to getCircuits.

Diffstat:
M
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
 | 
4
++--
M
mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs
 | 
10
+++++-----

2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoSession.java
@@ -2760,8 +2760,8 @@ public class GeckoSession {
    * @return The circuit information as a {@link GeckoResult} object.
    */
   @AnyThread
-  public @NonNull GeckoResult<GeckoBundle> getTorCircuit() {
-    return mEventDispatcher.queryBundle("GeckoView:GetTorCircuit");
+  public @NonNull GeckoResult<GeckoBundle> getTorCircuits() {
+    return mEventDispatcher.queryBundle("GeckoView:GetTorCircuits");
   }
 
   /**
diff --git a/mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs b/mobile/shared/modules/geckoview/GeckoViewContent.sys.mjs
@@ -297,8 +297,8 @@ export class GeckoViewContent extends GeckoViewModule {
       case "GeckoView:HasCookieBannerRuleForBrowsingContextTree":
         this._hasCookieBannerRuleForBrowsingContextTree(aCallback);
         break;
-      case "GeckoView:GetTorCircuit":
-        this._getTorCircuit(aCallback);
+      case "GeckoView:GetTorCircuits":
+        this._getTorCircuits(aCallback);
         break;
       case "GeckoView:NewTorCircuit":
         this._newTorCircuit(aCallback);
@@ -472,15 +472,15 @@ export class GeckoViewContent extends GeckoViewModule {
     }
   }
 
-  _getTorCircuit(aCallback) {
+  _getTorCircuits(aCallback) {
     if (this.browser && aCallback) {
       const domain = lazy.TorDomainIsolator.getDomainForBrowser(this.browser);
-      const nodes = lazy.TorDomainIsolator.getCircuit(
+      const circuits = lazy.TorDomainIsolator.getCircuits(
         this.browser,
         domain,
         this.browser.contentPrincipal.originAttributes.userContextId
       );
-      aCallback?.onSuccess({ domain, nodes });
+      aCallback?.onSuccess({ domain, circuits });
     } else {
       aCallback?.onSuccess(null);
     }