Extract error messages to string resources

Useful for validation errors and localisation later on

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

1 files changed, 7 insertions, 3 deletions

diff --git a/app/src/main/java/com/wireguard/config/Peer.java b/app/src/main/java/com/wireguard/config/Peer.java
index b65f52cb..1ed615e6 100644
--- a/app/src/main/java/com/wireguard/config/Peer.java
+++ b/app/src/main/java/com/wireguard/config/Peer.java
@@ -6,6 +6,7 @@
 
 package com.wireguard.config;
 
+import android.content.Context;
 import android.databinding.BaseObservable;
 import android.databinding.Bindable;
 import android.os.Parcel;
@@ -13,6 +14,8 @@ import android.os.Parcelable;
 import android.support.annotation.Nullable;
 
 import com.android.databinding.library.baseAdapters.BR;
+import com.wireguard.android.Application;
+import com.wireguard.android.R;
 import com.wireguard.crypto.KeyEncoding;
 
 import java.net.Inet6Address;
@@ -38,6 +41,7 @@ public class Peer {
     private int persistentKeepalive;
     @Nullable private String preSharedKey;
     @Nullable private String publicKey;
+    private final Context context = Application.get();
 
     public Peer() {
         allowedIPsList = new ArrayList<>();
@@ -117,7 +121,7 @@ public class Peer {
     public void parse(final String line) {
         final Attribute key = Attribute.match(line);
         if (key == null)
-            throw new IllegalArgumentException(String.format("Unable to parse line: \"%s\"", line));
+            throw new IllegalArgumentException(context.getString(R.string.tunnel_error_interface_parse_failed, line));
         switch (key) {
             case ALLOWED_IPS:
                 addAllowedIPs(key.parseList(line));
@@ -152,7 +156,7 @@ public class Peer {
         if (endpoint != null && !endpoint.isEmpty()) {
             final InetSocketAddress constructedEndpoint;
             if (endpoint.indexOf('/') != -1 || endpoint.indexOf('?') != -1 || endpoint.indexOf('#') != -1)
-                throw new IllegalArgumentException("Forbidden characters in endpoint");
+                throw new IllegalArgumentException(context.getString(R.string.tunnel_error_forbidden_endpoint_chars));
             final URI uri;
             try {
                 uri = new URI("wg://" + endpoint);
@@ -253,7 +257,7 @@ public class Peer {
             parent.setPreSharedKey(preSharedKey);
             parent.setPublicKey(publicKey);
             if (parent.getPublicKey() == null)
-                throw new IllegalArgumentException("Peer public key may not be empty");
+                throw new IllegalArgumentException(Application.get().getString(R.string.tunnel_error_empty_peer_public_key));
             loadData(parent);
             notifyChange();
         }