From 9652fe99df68db5c483ea8e170f6e09f06a5e0d1 Mon Sep 17 00:00:00 2001 From: Eric Kuck Date: Wed, 25 Jul 2018 19:30:34 -0500 Subject: TunnelDetailFragment now restores state correctly after process death Signed-off-by: Jason A. Donenfeld --- .../main/java/com/wireguard/android/backend/GoBackend.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/com/wireguard/android/backend/GoBackend.java') diff --git a/app/src/main/java/com/wireguard/android/backend/GoBackend.java b/app/src/main/java/com/wireguard/android/backend/GoBackend.java index a075913f..605f00eb 100644 --- a/app/src/main/java/com/wireguard/android/backend/GoBackend.java +++ b/app/src/main/java/com/wireguard/android/backend/GoBackend.java @@ -240,10 +240,13 @@ public final class GoBackend implements Backend { @Override public void onDestroy() { - for (final Tunnel tunnel : Application.getTunnelManager().getTunnels()) { - if (tunnel != null && tunnel.getState() != State.DOWN) - tunnel.setState(State.DOWN); - } + Application.getTunnelManager().getTunnels().thenAccept(tunnels -> { + for (final Tunnel tunnel : tunnels) { + if (tunnel != null && tunnel.getState() != State.DOWN) + tunnel.setState(State.DOWN); + } + }); + vpnService = vpnService.newIncompleteFuture(); super.onDestroy(); } -- cgit v1.3-18-gd494