[tor-commits] [orbot/master] remove unneeded commands in tor config and startup

[n8fr8 at torproject.org]

commit e78c27bfb0db5cf7e4ea18ff23645e432bd00224
Author: n8fr8 <nathan at guardianproject.info>
Date:   Mon Apr 27 17:35:06 2020 -0400

    remove unneeded commands in tor config and startup
---
 .../src/main/java/org/torproject/android/service/OrbotService.java | 7 +++----
 1 file changed, 3 insertions(+), 4 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
index 8762a7e5..57cff570 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java
@@ -646,8 +646,8 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC
 
         extraLines.append("PidFile").append(' ').append(filePid.getCanonicalPath()).append('\n');
 
-       extraLines.append("RunAsDaemon 1").append('\n');
-       extraLines.append("AvoidDiskWrites 1").append('\n');
+       //extraLines.append("RunAsDaemon 1").append('\n');
+       //extraLines.append("AvoidDiskWrites 1").append('\n');
         
          String socksPortPref = prefs.getString(OrbotConstants.PREF_SOCKS, (TorServiceConstants.SOCKS_PROXY_PORT_DEFAULT));
 
@@ -1098,7 +1098,7 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC
 
                         logNotice( "SUCCESS - authenticated to control port.");
 
-                        sendCallbackLogMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete));
+                      //  sendCallbackLogMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete));
 
                         String torProcId = conn.getInfo("process/pid");
 
@@ -1213,7 +1213,6 @@ public class OrbotService extends Service implements TorServiceConstants, OrbotC
 
         logNotice( "SUCCESS added control port event handler");
 
-        conn.setConf("DisableNetwork","0");
 
     }