GoBackend: bring down tunnels when revoked or disconnected

This synchronizes the OS's connection state with ours, such as when the
user disconnects using the system UI.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-04-25 18:26:42 +02:00
parent 86ffb24748
commit 532edf774a

View File

@ -7,9 +7,11 @@ import android.support.v4.util.ArraySet;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import com.wireguard.android.Application;
import com.wireguard.android.model.Tunnel; import com.wireguard.android.model.Tunnel;
import com.wireguard.android.model.Tunnel.State; import com.wireguard.android.model.Tunnel.State;
import com.wireguard.android.model.Tunnel.Statistics; import com.wireguard.android.model.Tunnel.Statistics;
import com.wireguard.android.model.TunnelManager;
import com.wireguard.config.Config; import com.wireguard.config.Config;
import com.wireguard.config.IPCidr; import com.wireguard.config.IPCidr;
import com.wireguard.config.Interface; import com.wireguard.config.Interface;
@ -56,6 +58,10 @@ public final class GoBackend implements Backend {
@Override @Override
public void onDestroy() { public void onDestroy() {
for (final Tunnel tunnel : Application.getComponent().getTunnelManager().getTunnels()) {
if (tunnel != null && tunnel.getState() != State.DOWN)
tunnel.setState(State.DOWN);
}
vpnService = vpnService.newIncompleteFuture(); vpnService = vpnService.newIncompleteFuture();
super.onDestroy(); super.onDestroy();
} }