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

Centralize/unify validation of configurations

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Samuel Holland
2017-08-24 22:13:46 -05:00
parent 23fdb72eda
commit a828e83399
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/config/Config.java
+1 -9
View File
@@ -40,7 +40,7 @@ public class Config extends BaseObservable
public static final int NAME_MAX_LENGTH = 16;
private static final Pattern PATTERN = Pattern.compile("^[a-zA-Z0-9_=+.-]{1,16}$");
private static boolean isNameValid(final String name) {
public static boolean isNameValid(final String name) {
return name.length() <= NAME_MAX_LENGTH && PATTERN.matcher(name).matches();
}
@@ -180,14 +180,6 @@ public class Config extends BaseObservable
return sb.toString();
}
public String validate() {
if (name == null || !isNameValid(name))
return "This configuration does not have a valid name.";
if (iface.getPublicKey() == null)
return "This configuration does not have a valid keypair.";
return null;
}
@Override
public void writeToParcel(final Parcel dest, final int flags) {
dest.writeParcelable(iface, flags);