Pārlūkot izejas kodu

config: show more informative error message on wrong key

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
master
Jason A. Donenfeld pirms 6 gadiem
vecāks
revīzija
9f861096ac
4 mainītis faili ar 6 papildinājumiem un 1 dzēšanām
  1. +1
    -1
      app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
  2. +1
    -0
      app/src/main/java/com/wireguard/config/Attribute.java
  3. +2
    -0
      app/src/main/java/com/wireguard/config/Interface.java
  4. +2
    -0
      app/src/main/java/com/wireguard/config/Peer.java

+ 1
- 1
app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java Parādīt failu

@@ -85,7 +85,7 @@ public class TunnelListFragment extends BaseFragment {
final FragmentManager fragmentManager = getFragmentManager();
if (fragmentManager != null)
ConfigNamingDialogFragment.newInstance(configText).show(fragmentManager, null);
} catch (final IllegalArgumentException|IOException exception) {
} catch (final Exception exception) {
onTunnelImportFinished(Collections.emptyList(), Collections.singletonList(exception));
}
}


+ 1
- 0
app/src/main/java/com/wireguard/config/Attribute.java Parādīt failu

@@ -55,6 +55,7 @@ public enum Attribute {
return TextUtils.join(", ", iterable);
}

@Nullable
public static Attribute match(final CharSequence line) {
return KEY_MAP.get(SEPARATOR_PATTERN.split(line)[0].toLowerCase());
}


+ 2
- 0
app/src/main/java/com/wireguard/config/Interface.java Parādīt failu

@@ -140,6 +140,8 @@ public class Interface {

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));
switch (key) {
case ADDRESS:
addAddresses(key.parseList(line));


+ 2
- 0
app/src/main/java/com/wireguard/config/Peer.java Parādīt failu

@@ -113,6 +113,8 @@ 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));
switch (key) {
case ALLOWED_IPS:
addAllowedIPs(key.parseList(line));


Notiek ielāde…
Atcelt
Saglabāt