diff options
Diffstat (limited to '')
-rw-r--r-- | app/src/main/java/com/wireguard/config/Config.java | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/app/src/main/java/com/wireguard/config/Config.java b/app/src/main/java/com/wireguard/config/Config.java index 62ba252c..0599dec3 100644 --- a/app/src/main/java/com/wireguard/config/Config.java +++ b/app/src/main/java/com/wireguard/config/Config.java @@ -12,6 +12,7 @@ import android.databinding.ObservableArrayList; import android.databinding.ObservableList; import android.os.Parcel; import android.os.Parcelable; +import android.support.annotation.Nullable; import com.android.databinding.library.baseAdapters.BR; @@ -96,13 +97,19 @@ public class Config { return new Observable[size]; } }; - private String name; - private Interface.Observable observableInterface; - private ObservableList<Peer.Observable> observablePeers; + @Nullable private String name; + private final Interface.Observable observableInterface; + private final ObservableList<Peer.Observable> observablePeers; - public Observable(final Config parent, final String name) { + public Observable(@Nullable final Config parent, @Nullable final String name) { this.name = name; - loadData(parent); + + observableInterface = new Interface.Observable(parent == null ? null : parent.interfaceSection); + observablePeers = new ObservableArrayList<>(); + if (parent != null) { + for (final Peer peer : parent.getPeers()) + observablePeers.add(new Peer.Observable(peer)); + } } private Observable(final Parcel in) { @@ -144,15 +151,6 @@ public class Config { return observablePeers; } - protected void loadData(final Config parent) { - observableInterface = new Interface.Observable(parent == null ? null : parent.interfaceSection); - observablePeers = new ObservableArrayList<>(); - if (parent != null) { - for (final Peer peer : parent.getPeers()) - observablePeers.add(new Peer.Observable(peer)); - } - } - public void setName(final String name) { this.name = name; notifyPropertyChanged(BR.name); |