Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RootShell: stop if we can't start

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-01-09 15:23:26 +01:00 committed by Samuel Holland
parent 23c09eb655
commit 643b698f30
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/wireguard/android/util/RootShell.java
View File

@ -112,6 +112,7 @@ public class RootShell {
} }
public synchronized void start() throws IOException, NoRootException { public synchronized void start() throws IOException, NoRootException {
try {
if (isRunning()) if (isRunning())
return; return;
if (!localBinaryDir.isDirectory() && !localBinaryDir.mkdirs()) if (!localBinaryDir.isDirectory() && !localBinaryDir.mkdirs())
@ -145,6 +146,10 @@ public class RootShell {
} }
throw new IOException("Shell failed to start: " + process.exitValue()); throw new IOException("Shell failed to start: " + process.exitValue());
} }
} catch (final IOException | NoRootException e) {
stop();
throw e;
}
} }
public synchronized void stop() throws IOException { public synchronized void stop() throws IOException {