From 4b401a368fefa2099a3e33d9c4b7a9fb05dd35c4 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Fri, 4 Aug 2017 00:37:58 -0500 Subject: [PATCH] RootShell: Make shell command configurable Signed-off-by: Jason A. Donenfeld --- app/src/main/java/com/wireguard/android/RootShell.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/wireguard/android/RootShell.java b/app/src/main/java/com/wireguard/android/RootShell.java index c060c967..f5879f00 100644 --- a/app/src/main/java/com/wireguard/android/RootShell.java +++ b/app/src/main/java/com/wireguard/android/RootShell.java @@ -24,10 +24,16 @@ class RootShell { private static final String TAG = "RootShell"; private final byte setupCommands[]; + private final String shell; RootShell(Context context) { + this(context, "su"); + } + + RootShell(Context context, String shell) { final String tmpdir = context.getCacheDir().getPath(); setupCommands = String.format(SETUP_TEMPLATE, tmpdir).getBytes(StandardCharsets.UTF_8); + this.shell = shell; } /** @@ -45,7 +51,7 @@ class RootShell { int exitValue = -1; try { final ProcessBuilder builder = new ProcessBuilder().redirectErrorStream(true); - final Process process = builder.command("su").start(); + final Process process = builder.command(shell).start(); final OutputStream stdin = process.getOutputStream(); stdin.write(setupCommands); for (String command : commands)