[tor-commits] [orbot/master] fixed status bug reported in #556

[n8fr8 at torproject.org]

commit d8f6ebb333a3d2b1886949c7dc44a9870264029d
Author: b <dsnake at protonmail.com>
Date:   Fri Dec 17 14:59:10 2021 -0500

    fixed status bug reported in #556
---
 .../main/java/org/torproject/android/service/OrbotService.java   | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
index 3cc7ab40..190ecc4e 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -734,7 +734,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
                         }
                     }
                 }
+                /*
+                This old status hack is temporary and fixes the issue reported by syphyr at
+                https://github.com/guardianproject/orbot/pull/556
+                Down the line a better approach needs to happen for sending back the onion names updated
+                status, perhaps just adding it as an extra to the normal Intent callback...
+                 */
+                String oldStatus = mCurrentStatus;
                 sendCallbackStatus(STATUS_V3_NAMES_UPDATED);
+                mCurrentStatus = oldStatus;
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -1400,7 +1408,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb
 
         public void run() {
             String action = mIntent.getAction();
-
             if (!TextUtils.isEmpty(action)) {
                 if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) {