diff options
| author |   Samuel Holland <samuel@sholland.org> | 2018-01-07 00:25:33 -0600 |
|---|---|---|
| committer | Samuel Holland <samuel@sholland.org> | 2018-01-07 00:25:33 -0600 |
| commit | 6126860edbe1b6b7f1a14611103dfe18396863d3 (patch) | |
| tree | 13e81fd015b3dcf985492411c05c56a8ac261eaa /app/src/main/java/com/wireguard/android/fragment | |
| parent | Make TunnelManager the point of asynchronicity (diff) | |
| download | wireguard-android-6126860edbe1b6b7f1a14611103dfe18396863d3.tar.xz wireguard-android-6126860edbe1b6b7f1a14611103dfe18396863d3.zip | |
ConfigEditorFragment: Ensure localName is never null
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/ConfigEditorFragment.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/ConfigEditorFragment.java b/app/src/main/java/com/wireguard/android/fragment/ConfigEditorFragment.java index e2f5aa02..582ead93 100644 --- a/app/src/main/java/com/wireguard/android/fragment/ConfigEditorFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/ConfigEditorFragment.java @@ -34,7 +34,7 @@ public class ConfigEditorFragment extends BaseFragment { private static final String KEY_LOCAL_NAME = "local_name"; private static final String TAG = ConfigEditorFragment.class.getSimpleName(); - private final ObservableField<String> localName = new ObservableField<>(); + private final ObservableField<String> localName = new ObservableField<>(""); private ConfigEditorFragmentBinding binding; private boolean isViewStateRestored; private Config localConfig = new Config(); @@ -105,7 +105,7 @@ public class ConfigEditorFragment extends BaseFragment { } else if (getSelectedTunnel() == null && originalName != null) { localConfig = new Config(); originalName = null; - localName.set(null); + localName.set(""); } setHasOptionsMenu(true); } @@ -184,13 +184,14 @@ public class ConfigEditorFragment extends BaseFragment { localConfig = null; newTunnel.getConfigAsync().thenAccept(this::onConfigLoaded); originalName = newTunnel.getName(); + localName.set(originalName); } else { localConfig = new Config(); if (binding != null && isViewStateRestored) binding.setConfig(localConfig); originalName = null; + localName.set(""); } - localName.set(originalName); } @Override |