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

model: Allow renaming tunnels

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-01-07 01:22:31 -06:00
parent e70b242c01
commit 30396b8718
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,12 @@ public class Tunnel extends BaseObservable implements Keyed<String> {
notifyPropertyChanged(BR.statistics); notifyPropertyChanged(BR.statistics);
} }
public CompletionStage<Tunnel> rename(@NonNull final String name) {
if (!name.equals(this.name))
return manager.rename(this, name);
return CompletableFuture.completedFuture(this);
}
public CompletionStage<Config> setConfig(@NonNull final Config config) { public CompletionStage<Config> setConfig(@NonNull final Config config) {
if (!config.equals(this.config)) if (!config.equals(this.config))
return manager.setTunnelConfig(this, config); return manager.setTunnelConfig(this, config);

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

@ -120,6 +120,32 @@ public final class TunnelManager {
addToList(name, null, running.contains(name) ? State.UP : State.DOWN); addToList(name, null, running.contains(name) ? State.UP : State.DOWN);
} }
CompletionStage<Tunnel> rename(final Tunnel tunnel, final String name) {
if (!Tunnel.isNameValid(name))
return CompletableFuture.failedFuture(new IllegalArgumentException("Invalid name"));
if (tunnels.containsKey(name)) {
final String message = "Tunnel " + name + " already exists";
return CompletableFuture.failedFuture(new IllegalArgumentException(message));
}
final State originalState = tunnel.getState();
return asyncWorker.supplyAsync(() -> {
backend.setState(tunnel, State.DOWN);
final Config newConfig = configStore.create(name, tunnel.getConfig());
final Tunnel newTunnel = new Tunnel(this, name, newConfig, State.DOWN);
if (originalState == State.UP) {
backend.setState(newTunnel, originalState);
newTunnel.onStateChanged(originalState);
}
configStore.delete(tunnel.getName());
return newTunnel;
}).whenComplete((newTunnel, e) -> {
if (e != null)
return;
tunnels.remove(tunnel);
tunnels.add(newTunnel);
});
}
public CompletionStage<Void> restoreState() { public CompletionStage<Void> restoreState() {
if (!preferences.getBoolean(KEY_RESTORE_ON_BOOT, false)) if (!preferences.getBoolean(KEY_RESTORE_ON_BOOT, false))
return CompletableFuture.completedFuture(null); return CompletableFuture.completedFuture(null);