diff options
author | Samuel Holland <samuel@sholland.org> | 2017-08-19 18:50:35 -0500 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2017-08-19 18:50:35 -0500 |
commit | 9026317b0ef5c32292c8f500105785cb8efde912 (patch) | |
tree | 32436517871c1cabb6207f30cfb797cc40c2a210 /app/src/main/java/com/wireguard/config/Config.java | |
parent | Minor cleanups (diff) | |
download | wireguard-android-9026317b0ef5c32292c8f500105785cb8efde912.tar.xz wireguard-android-9026317b0ef5c32292c8f500105785cb8efde912.zip |
Peer: Associate with a Config
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/java/com/wireguard/config/Config.java')
-rw-r--r-- | app/src/main/java/com/wireguard/config/Config.java | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/app/src/main/java/com/wireguard/config/Config.java b/app/src/main/java/com/wireguard/config/Config.java index 3f98cbcb..b2885710 100644 --- a/app/src/main/java/com/wireguard/config/Config.java +++ b/app/src/main/java/com/wireguard/config/Config.java @@ -34,6 +34,18 @@ public class Config extends BaseObservable private String name; private final ObservableList<Peer> peers = new ObservableArrayList<>(); + public Peer addPeer() { + final Peer peer = new Peer(this); + peers.add(peer); + return peer; + } + + private Peer addPeer(final Peer peer) { + final Peer copy = peer.copy(this); + peers.add(copy); + return copy; + } + @Override public int compareTo(@NonNull final Config config) { return getName().compareTo(config.getName()); @@ -53,7 +65,7 @@ public class Config extends BaseObservable name = source.name; peers.clear(); for (final Peer peer : source.peers) - peers.add(peer.copy()); + addPeer(peer); } public Interface getInterface() { @@ -92,8 +104,7 @@ public class Config extends BaseObservable if ("[Interface]".equals(line)) { currentPeer = null; } else if ("[Peer]".equals(line)) { - currentPeer = new Peer(); - peers.add(currentPeer); + currentPeer = addPeer(); } else if (currentPeer == null) { iface.parseFrom(line); } else { |