aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-01-08 20:30:03 -0600
committerSamuel Holland <samuel@sholland.org>2018-01-08 20:30:03 -0600
commit710ffc7bb3b7d9e568d2447de890438d4be9a0de (patch)
treefcf0119274b4571dfd85f2083da03784c803bc5f /app/src/main/java/com/wireguard/android/util/ToolsInstaller.java
parentlayout: never use suggestions (diff)
downloadwireguard-android-710ffc7bb3b7d9e568d2447de890438d4be9a0de.tar.xz
wireguard-android-710ffc7bb3b7d9e568d2447de890438d4be9a0de.zip
Fragment/Tile: Make success/error messages translatable
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/util/ToolsInstaller.java')
-rw-r--r--app/src/main/java/com/wireguard/android/util/ToolsInstaller.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java b/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java
index aeffa364..4b844991 100644
--- a/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java
+++ b/app/src/main/java/com/wireguard/android/util/ToolsInstaller.java
@@ -1,12 +1,15 @@
package com.wireguard.android.util;
import android.content.Context;
+import android.system.ErrnoException;
import android.system.OsConstants;
import com.wireguard.android.Application.ApplicationContext;
import com.wireguard.android.Application.ApplicationScope;
+import com.wireguard.android.util.RootShell.NoRootException;
import java.io.File;
+import java.io.IOException;
import java.util.Arrays;
import java.util.List;
@@ -67,7 +70,11 @@ public final class ToolsInstaller {
}
try {
return rootShell.run(null, script.toString());
- } catch (Exception e) {
+ } catch (final ErrnoException e) {
+ return e.errno;
+ } catch (final IOException ignored) {
+ return OsConstants.EXIT_FAILURE;
+ } catch (final NoRootException ignored) {
return OsConstants.EACCES;
}
}