[tor-commits] [orbot/master] fix OrbotService rename

n8fr8 at torproject.org n8fr8 at torproject.org
Tue Apr 28 21:05:01 UTC 2020


commit 57e3ee1b3d8bd692f7cc17f32759aab9aefda1b1
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Wed Dec 18 12:50:21 2019 +0100

    fix OrbotService rename
---
 .../main/java/org/torproject/android/service/TorEventHandler.java   | 2 +-
 .../java/org/torproject/android/service/util/ExternalIPFetcher.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
index 466c4323..def94fcf 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorEventHandler.java
@@ -215,7 +215,7 @@ public class TorEventHandler implements EventHandler, TorServiceConstants {
 
                         if (node.ipAddress == null && (!node.isFetchingInfo) && Prefs.useDebugLogging()) {
                             node.isFetchingInfo = true;
-                            mService.exec(new ExternalIPFetcher(mService, node, TorService.mPortHTTP));
+                            mService.exec(new ExternalIPFetcher(mService, node, OrbotService.mPortHTTP));
                         }
 
                         isFirstNode = false;
diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java b/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java
index ae99e7de..e9a9b575 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/util/ExternalIPFetcher.java
@@ -3,7 +3,7 @@ package org.torproject.android.service.util;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.torproject.android.service.TorEventHandler;
-import org.torproject.android.service.TorService;
+import org.torproject.android.service.OrbotService;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -15,12 +15,12 @@ import java.net.URLConnection;
 
 public class ExternalIPFetcher implements Runnable {
 
-    private TorService mService;
+    private OrbotService mService;
     private TorEventHandler.Node mNode;
     private final static String ONIONOO_BASE_URL = "https://onionoo.torproject.org/details?fields=country_name,as_name,or_addresses&lookup=";
     private int mLocalHttpProxyPort = 8118;
 
-    public ExternalIPFetcher (TorService service, TorEventHandler.Node node, int localProxyPort )
+    public ExternalIPFetcher (OrbotService service, TorEventHandler.Node node, int localProxyPort )
     {
         mService = service;
         mNode = node;





More information about the tor-commits mailing list