make calls to start and stop synchronized

guardianproject · May 26, 2021 · 0d95079 · 0d95079
1 parent 18fc045
commit 0d95079
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -414,7 +414,7 @@ private void stopSnowflakeProxy () {
     /**
      * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor
      */
-    private void stopTor() throws Exception {
+    private synchronized void stopTor() throws Exception {
 
         if (conn != null) {
             logNotice("Using control port to shutdown Tor");
@@ -731,7 +731,7 @@ private void startTor() {
                     customEnv.add("TOR_PT_PROXY=socks5://" + OrbotVpnManager.sSocksProxyLocalhost + ":" + OrbotVpnManager.sSocksProxyServerPort);
                 }
 
-            runTorShellCmd();
+            startTorService();
 
             if (Prefs.hostOnionServicesEnabled()) {
                 try {
@@ -828,7 +828,7 @@ private void updateLegacyV2OnionNames() throws SecurityException {
         }
     }
 
-    private void runTorShellCmd() throws Exception {
+    private synchronized void startTorService() throws Exception {
         updateTorConfigCustom(TorService.getDefaultsTorrc(this),
                 "DNSPort 0\n" +
                 "TransPort 0\n" +