Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TunnelManager: Clear primary tunnel when it's removed

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-01-01 02:15:34 -06:00
parent 609194fae2
commit 58eedfd6d9
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/wireguard/android/model/TunnelManager.java
View File

@ -70,7 +70,11 @@ public final class TunnelManager {
Log.v(TAG, "Requested delete tunnel " + tunnel.getName() + " state=" + tunnel.getState()); Log.v(TAG, "Requested delete tunnel " + tunnel.getName() + " state=" + tunnel.getState());
return backend.setState(tunnel, State.DOWN) return backend.setState(tunnel, State.DOWN)
.thenCompose(x -> configStore.delete(tunnel.getName())) .thenCompose(x -> configStore.delete(tunnel.getName()))
.thenAccept(x -> tunnels.remove(tunnel.getName())); .thenAccept(x -> {
tunnels.remove(tunnel.getName());
if (tunnel.getName().equals(preferences.getString(KEY_PRIMARY_TUNNEL, null)))
preferences.edit().remove(KEY_PRIMARY_TUNNEL).apply();
});
} }
public TunnelCollection getTunnels() { public TunnelCollection getTunnels() {