aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/java/com/wireguard/android/fragment
diff options
context:
space:
mode:
authorZachary Wander <zachary.wander@gmail.com>2018-12-10 19:05:53 -0500
committerJason A. Donenfeld <Jason@zx2c4.com>2018-12-11 02:21:23 +0100
commit9de711a4f5b14d6c9fcfed00ecf4c91f773ee23b (patch)
tree198b094cf6e0bb92508a738924cfc69ebc0e2c81 /app/src/main/java/com/wireguard/android/fragment
parentLowercase endpoint in exception message (diff)
downloadwireguard-android-9de711a4f5b14d6c9fcfed00ecf4c91f773ee23b.tar.xz
wireguard-android-9de711a4f5b14d6c9fcfed00ecf4c91f773ee23b.zip
Localize exception messages
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/fragment')
-rw-r--r--app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java4
-rw-r--r--app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java7
2 files changed, 7 insertions, 4 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java b/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java
index 0931868e..878f9335 100644
--- a/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java
@@ -24,6 +24,7 @@ import com.wireguard.config.ParseException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
+import java.util.Locale;
import java.util.Objects;
public class ConfigNamingDialogFragment extends DialogFragment {
@@ -68,7 +69,8 @@ public class ConfigNamingDialogFragment extends DialogFragment {
try {
config = Config.parse(new ByteArrayInputStream(getArguments().getString(KEY_CONFIG_TEXT).getBytes(StandardCharsets.UTF_8)));
} catch (final IOException | ParseException exception) {
- throw new RuntimeException("Invalid config passed to " + getClass().getSimpleName(), exception);
+ throw new RuntimeException(String.format(Locale.getDefault(),
+ getResources().getString(R.string.invalid_config_error), getClass().getSimpleName()), exception);
}
}
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
index 51405745..85d66baa 100644
--- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
@@ -115,14 +115,15 @@ public class TunnelListFragment extends BaseFragment {
int idx = name.lastIndexOf('/');
if (idx >= 0) {
if (idx >= name.length() - 1)
- throw new IllegalArgumentException("Illegal file name: " + name);
+ throw new IllegalArgumentException(String.format(Locale.getDefault(),
+ getResources().getString(R.string.illegal_filename_error), name));
name = name.substring(idx + 1);
}
boolean isZip = name.toLowerCase(Locale.ENGLISH).endsWith(".zip");
if (name.toLowerCase(Locale.ENGLISH).endsWith(".conf"))
name = name.substring(0, name.length() - ".conf".length());
else if (!isZip)
- throw new IllegalArgumentException("File must be .conf or .zip");
+ throw new IllegalArgumentException(getResources().getString(R.string.bad_extension_error));
if (isZip) {
try (ZipInputStream zip = new ZipInputStream(contentResolver.openInputStream(uri));
@@ -161,7 +162,7 @@ public class TunnelListFragment extends BaseFragment {
if (throwables.size() == 1)
throw throwables.get(0);
else if (throwables.isEmpty())
- throw new IllegalArgumentException("No configurations found");
+ throw new IllegalArgumentException(getResources().getString(R.string.no_configs_error));
}
return CompletableFuture.allOf(futureTunnels.toArray(new CompletableFuture[futureTunnels.size()]));