diff options
author | Samuel Holland <samuel@sholland.org> | 2018-01-10 00:03:03 -0600 |
---|---|---|
committer | Samuel Holland <samuel@sholland.org> | 2018-01-10 00:03:03 -0600 |
commit | dab2d7f76018aed4e5f9cd2e20842e55f94f8e74 (patch) | |
tree | 0239985dff63d68f282023abd03034a3a11296e1 /app/src/main/java/com/wireguard/android/fragment | |
parent | ConfigStore: Add a rename method and implement it (diff) | |
download | wireguard-android-dab2d7f76018aed4e5f9cd2e20842e55f94f8e74.tar.xz wireguard-android-dab2d7f76018aed4e5f9cd2e20842e55f94f8e74.zip |
model: Use ConfigStore.rename() to avoid recreating tunnels
Rename all of the functions to be in line with setConfig/setState
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/fragment')
-rw-r--r-- | app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java index aa4321e8..fdb5fc20 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java @@ -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); |