From 0ab3e294321e5a50d61474ff29391d40edf9e443 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sun, 7 Jan 2018 20:33:07 -0600 Subject: Tunnel: Remove UNKNOWN state It's never used. Signed-off-by: Samuel Holland --- .../main/java/com/wireguard/android/backend/WgQuickBackend.java | 2 -- app/src/main/java/com/wireguard/android/model/Tunnel.java | 7 +------ 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'app/src/main/java/com/wireguard') diff --git a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java index 93ddcc32..0bca1bd7 100644 --- a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java +++ b/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java @@ -35,8 +35,6 @@ public final class WgQuickBackend implements Backend { } private static State resolveState(final State currentState, State requestedState) { - if (requestedState == State.UNKNOWN) - throw new IllegalArgumentException("Requested unknown state"); if (requestedState == State.TOGGLE) requestedState = currentState == State.UP ? State.DOWN : State.UP; return requestedState; 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 9cdcf71f..6edb6acd 100644 --- a/app/src/main/java/com/wireguard/android/model/Tunnel.java +++ b/app/src/main/java/com/wireguard/android/model/Tunnel.java @@ -69,15 +69,11 @@ public class Tunnel extends BaseObservable implements Keyed { @Bindable public State getState() { - if (state == State.UNKNOWN) - manager.getTunnelState(this).whenComplete(ExceptionLoggers.E); return state; } public CompletionStage getStateAsync() { - if (state == State.UNKNOWN) - return manager.getTunnelState(this); - return CompletableFuture.completedFuture(state); + return manager.getTunnelState(this); } @Bindable @@ -133,7 +129,6 @@ public class Tunnel extends BaseObservable implements Keyed { public enum State { DOWN, TOGGLE, - UNKNOWN, UP } -- cgit v1.2.3