frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

RootShell: Simplify, synchronize, clean up

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland
2018-01-09 08:13:11 -06:00
parent 662bc3894b
commit 52e8eef9ce
2 changed files with 89 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/android/util/ToolsInstaller.java
+2 -7
View File
@@ -1,7 +1,6 @@
package com.wireguard.android.util;
import android.content.Context;
import android.system.ErrnoException;
import android.system.OsConstants;
import android.util.Log;
@@ -69,7 +68,7 @@ public final class ToolsInstaller {
script.append("exit ").append(OsConstants.EALREADY).append(';');
try {
return rootShell.run(null, script.toString()) == OsConstants.EALREADY;
} catch (final ErrnoException | IOException | NoRootException ignored) {
} catch (final IOException | NoRootException ignored) {
return false;
}
}
@@ -84,7 +83,7 @@ public final class ToolsInstaller {
script.append("exit ").append(OsConstants.EALREADY).append(';');
try {
return rootShell.run(null, script.toString()) == OsConstants.EALREADY;
} catch (final ErrnoException | IOException | NoRootException ignored) {
} catch (final IOException | NoRootException ignored) {
return false;
}
}
@@ -125,8 +124,6 @@ public final class ToolsInstaller {
}
try {
return rootShell.run(null, script.toString());
} catch (final ErrnoException e) {
return e.errno;
} catch (final IOException ignored) {
return OsConstants.EXIT_FAILURE;
} catch (final NoRootException ignored) {
@@ -143,8 +140,6 @@ public final class ToolsInstaller {
}
try {
return rootShell.run(null, script.toString());
} catch (final ErrnoException e) {
return e.errno;
} catch (final IOException ignored) {
return OsConstants.EXIT_FAILURE;
} catch (final NoRootException ignored) {