[tor-commits] [orbot/master] send ports on start request, even if tor is already running

[n8fr8@xxxxxxxxxxxxxx]

commit c6bfc4911bc23aabe2ecc6c4d3878fd4d766b942
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Aug 2 09:26:08 2019 -0400

    send ports on start request, even if tor is already running
---
 .../src/main/java/org/torproject/android/service/TorService.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index c83c252e..793257d7 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -381,8 +381,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
 
             if (action != null) {
                 if (action.equals(ACTION_START)) {
-                    replyWithStatus(mIntent);
                     startTor();
+                    replyWithStatus(mIntent);
+
                 }
                 else if (action.equals(ACTION_STATUS)) {
                     replyWithStatus(mIntent);                    
@@ -814,6 +815,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
 
         LocalBroadcastManager.getInstance(this).sendBroadcast(reply);
 
+        if (mPortSOCKS != -1 && mPortHTTP != -1)
+            sendCallbackPorts(mPortSOCKS, mPortHTTP, mPortDns, mPortTrans);
+
     }
 
     /**



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits