diff options
| author |   Samuel Holland <samuel@sholland.org> | 2018-01-08 03:38:44 -0600 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2018-01-08 04:31:04 -0600 |
| commit | b6ed17884fc550361e793fab45cd08fce49e6ce5 (patch) | |
| tree | 6970d9b1e2403b39277ea1fb28b4aabe293ba0ca /app/src/main/java/com/wireguard/android/model | |
| parent | WgQuickBackend: Improve error handling (diff) | |
| download | wireguard-android-b6ed17884fc550361e793fab45cd08fce49e6ce5.tar.xz wireguard-android-b6ed17884fc550361e793fab45cd08fce49e6ce5.zip | |
ToggleSwitch: Improve reliability
It's not great, but it's better than it was.
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/model')
| -rw-r--r-- | app/src/main/java/com/wireguard/android/model/TunnelManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/java/com/wireguard/android/model/TunnelManager.java b/app/src/main/java/com/wireguard/android/model/TunnelManager.java index feb60124..816d6708 100644 --- a/app/src/main/java/com/wireguard/android/model/TunnelManager.java +++ b/app/src/main/java/com/wireguard/android/model/TunnelManager.java @@ -237,9 +237,10 @@ public final class TunnelManager extends BaseObservable { CompletionStage<State> setTunnelState(final Tunnel tunnel, final State state) { final CompletionStage<State> completion = asyncWorker.supplyAsync(() -> backend.setState(tunnel, state)); - completion.thenAccept(tunnel::onStateChanged); - completion.thenAccept(newState -> { - if (newState == State.UP) + completion.whenComplete((newState, e) -> { + // Ensure onStateChanged is always called (failure or not), and with the correct state. + tunnel.onStateChanged(e == null ? newState : tunnel.getState()); + if (e == null && newState == State.UP) setLastUsedTunnel(tunnel); }); return completion; |