From 328b3ef273e638fe6ba65312468a367843f4158a Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 21 Sep 2017 12:27:06 +0900
Subject: [PATCH] Don't disable root in SyncthingRunnable until it is stopped
 (ref #949)

---
 .../service/SyncthingRunnable.java             | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
index ea132415..1fe240d0 100644
--- a/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
+++ b/src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
@@ -55,6 +55,7 @@ public class SyncthingRunnable implements Runnable {
     private String[] mCommand;
     private final File mLogFile;
     private final SharedPreferences mPreferences;
+    private final boolean mUseRoot;
 
     public enum Command {
         generate, // Generate keys, a config file and immediately exit.
@@ -72,6 +73,7 @@ public class SyncthingRunnable implements Runnable {
         mSyncthingBinary = mContext.getApplicationInfo().nativeLibraryDir + "/" + BINARY_NAME;
         mLogFile = new File(mContext.getExternalFilesDir(null), "syncthing.log");
         mPreferences = PreferenceManager.getDefaultSharedPreferences(mContext);
+        mUseRoot = mPreferences.getBoolean(SyncthingService.PREF_USE_ROOT, false) && Shell.SU.available();
         switch (command) {
             case generate:
                 mCommand = new String[]{ mSyncthingBinary, "-generate", mContext.getFilesDir().toString() };
@@ -98,6 +100,7 @@ public class SyncthingRunnable implements Runnable {
         mCommand = manualCommand;
         mLogFile = new File(mContext.getExternalFilesDir(null), "syncthing.log");
         mPreferences = PreferenceManager.getDefaultSharedPreferences(mContext);
+        mUseRoot = false;
     }
 
     @Override
@@ -123,7 +126,7 @@ public class SyncthingRunnable implements Runnable {
         try {
             if (wakeLock != null)
                 wakeLock.acquire();
-            ProcessBuilder pb = (useRoot())
+            ProcessBuilder pb = (mUseRoot)
                     ? new ProcessBuilder("su", "-c", TextUtils.join(" ", mCommand))
                     : new ProcessBuilder(mCommand);
 
@@ -215,13 +218,6 @@ public class SyncthingRunnable implements Runnable {
         }
     }
 
-    /**
-     * Returns true if root is available and enabled in settings.
-     */
-    private boolean useRoot() {
-        return mPreferences.getBoolean(SyncthingService.PREF_USE_ROOT, false) && Shell.SU.available();
-    }
-
     /**
      * Returns true if the experimental setting for using wake locks has been enabled in settings.
      */
@@ -240,7 +236,7 @@ public class SyncthingRunnable implements Runnable {
                 int ret = 1;
                 try {
                     Thread.sleep(1000); // Wait a second before getting the pid
-                    nice = Runtime.getRuntime().exec((useRoot()) ? "su" : "sh");
+                    nice = Runtime.getRuntime().exec((mUseRoot) ? "su" : "sh");
                     niceOut = new DataOutputStream(nice.getOutputStream());
                     niceOut.writeBytes("set `ps | grep libsyncthing.so`\n");
                     niceOut.writeBytes("ionice $2 be 7\n"); // best-effort, low priority
@@ -279,7 +275,7 @@ public class SyncthingRunnable implements Runnable {
             Process ps = null;
             DataOutputStream psOut = null;
             try {
-                ps = Runtime.getRuntime().exec((useRoot()) ? "su" : "sh");
+                ps = Runtime.getRuntime().exec((mUseRoot) ? "su" : "sh");
                 psOut = new DataOutputStream(ps.getOutputStream());
                 psOut.writeBytes("ps | grep libsyncthing.so\n");
                 psOut.writeBytes("exit\n");
@@ -317,7 +313,7 @@ public class SyncthingRunnable implements Runnable {
         Process kill = null;
         DataOutputStream killOut = null;
         try {
-            kill = Runtime.getRuntime().exec((useRoot()) ? "su" : "sh");
+            kill = Runtime.getRuntime().exec((mUseRoot) ? "su" : "sh");
             killOut = new DataOutputStream(kill.getOutputStream());
             if (!force) {
                 killOut.writeBytes("kill -SIGINT " + id + "\n");