frank/wirevpn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

model: Use ConfigStore.rename() to avoid recreating tunnels

Browse Source 
Rename all of the functions to be in line with setConfig/setState

Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland
2018-01-10 00:03:03 -06:00
parent 951afaa9b2
commit 7b9c1a536c
3 changed files with 51 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
+5 -7
View File
@@ -154,7 +154,7 @@ public class TunnelEditorFragment extends BaseFragment {
.whenComplete(this::onTunnelCreated);
} else if (!selectedTunnel.getName().equals(localName.get())) {
Log.d(TAG, "Attempting to rename tunnel to " + localName.get());
selectedTunnel.rename(localName.get())
selectedTunnel.setName(localName.get())
.whenComplete(this::onTunnelRenamed);
} else if (localConfig != null) {
Log.d(TAG, "Attempting to save config of " + selectedTunnel.getName());
@@ -212,16 +212,14 @@ public class TunnelEditorFragment extends BaseFragment {
}
}
private void onTunnelRenamed(final Tunnel tunnel, final Throwable throwable) {
private void onTunnelRenamed(final String name, final Throwable throwable) {
final String message;
if (throwable == null) {
message = getString(R.string.tunnel_rename_success, localTunnel.getName(),
tunnel.getName());
message = getString(R.string.tunnel_rename_success, localTunnel.getName(), name);
Log.d(TAG, message);
localTunnel = tunnel;
// Now save the rest of configuration changes.
Log.d(TAG, "Attempting to save config of renamed tunnel " + tunnel.getName());
tunnel.setConfig(localConfig).whenComplete(this::onConfigSaved);
Log.d(TAG, "Attempting to save config of renamed tunnel " + localTunnel.getName());
localTunnel.setConfig(localConfig).whenComplete(this::onConfigSaved);
} else {
final String error = ExceptionLoggers.unwrap(throwable).getMessage();
message = getString(R.string.tunnel_rename_error, error);