diff options
| author |   Samuel Holland <samuel@sholland.org> | 2018-01-01 02:15:34 -0600 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2018-01-06 04:09:30 -0600 |
| commit | 58eedfd6d90a11aa803277b2bfd9eef6dd2258be (patch) | |
| tree | f2d97bab075766e3da4e976b23038be7eaf7ce0d /app/src/main/java/com/wireguard/android/model/TunnelManager.java | |
| parent | Serviceless rewrite, part 1 (diff) | |
| download | wireguard-android-58eedfd6d90a11aa803277b2bfd9eef6dd2258be.tar.xz wireguard-android-58eedfd6d90a11aa803277b2bfd9eef6dd2258be.zip | |
TunnelManager: Clear primary tunnel when it's removed
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/model/TunnelManager.java')
| -rw-r--r-- | app/src/main/java/com/wireguard/android/model/TunnelManager.java | 6 |
1 files changed, 5 insertions, 1 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 5122f9bf..b6f6819d 100644 --- a/app/src/main/java/com/wireguard/android/model/TunnelManager.java +++ b/app/src/main/java/com/wireguard/android/model/TunnelManager.java @@ -70,7 +70,11 @@ public final class TunnelManager { Log.v(TAG, "Requested delete tunnel " + tunnel.getName() + " state=" + tunnel.getState()); return backend.setState(tunnel, State.DOWN) .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() { |