From ff0bb081a0baa6f6a1666429eec613c1ed811566 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sat, 6 Jan 2018 04:04:42 -0600 Subject: Convert the list of tunnels to a KeyedObservableList Signed-off-by: Samuel Holland --- app/src/main/java/com/wireguard/android/model/Tunnel.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'app/src/main/java/com/wireguard/android/model/Tunnel.java') diff --git a/app/src/main/java/com/wireguard/android/model/Tunnel.java b/app/src/main/java/com/wireguard/android/model/Tunnel.java index b196eaa5..25bb46df 100644 --- a/app/src/main/java/com/wireguard/android/model/Tunnel.java +++ b/app/src/main/java/com/wireguard/android/model/Tunnel.java @@ -9,6 +9,7 @@ import com.wireguard.android.BR; import com.wireguard.android.backend.Backend; import com.wireguard.android.configStore.ConfigStore; import com.wireguard.android.util.ExceptionLoggers; +import com.wireguard.android.util.Keyed; import com.wireguard.config.Config; import org.threeten.bp.Instant; @@ -23,7 +24,7 @@ import java9.util.concurrent.CompletionStage; * Encapsulates the volatile and nonvolatile state of a WireGuard tunnel. */ -public class Tunnel extends BaseObservable implements Comparable { +public class Tunnel extends BaseObservable implements Keyed { public static final int NAME_MAX_LENGTH = 16; private static final Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z0-9_=+.-]{1,16}"); private static final String TAG = Tunnel.class.getSimpleName(); @@ -48,11 +49,6 @@ public class Tunnel extends BaseObservable implements Comparable { return name != null && NAME_PATTERN.matcher(name).matches(); } - @Override - public int compareTo(@NonNull final Tunnel tunnel) { - return name.compareTo(tunnel.name); - } - @Bindable public Config getConfig() { if (config == null) @@ -66,6 +62,11 @@ public class Tunnel extends BaseObservable implements Comparable { return CompletableFuture.completedFuture(config); } + @Override + public String getKey() { + return name; + } + @Bindable public Instant getLastStateChange() { return lastStateChange; -- cgit v1.2.3-59-g8ed1b