Fragment/Tile: Make success/error messages translatable

Signed-off-by: Samuel Holland <samuel@sholland.org>
2018-01-08 20:30:03 -06:00
parent 6361628e16
commit 710ffc7bb3
8 changed files with 102 additions and 74 deletions
@@ -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;
        }
    }