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

TunnelDetailFragment: rewrite and simplify

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-04-30 05:28:51 +02:00
parent 73b0c4ea81
commit 596904977a
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.java
View File

@ -19,8 +19,6 @@ import com.wireguard.config.Config;
public class TunnelDetailFragment extends BaseFragment { public class TunnelDetailFragment extends BaseFragment {
private TunnelDetailFragmentBinding binding; private TunnelDetailFragmentBinding binding;
private boolean isViewStateRestored;
private String originalName;
@Override @Override
public void onCreate(final Bundle savedInstanceState) { public void onCreate(final Bundle savedInstanceState) {
@ -48,34 +46,24 @@ public class TunnelDetailFragment extends BaseFragment {
super.onDestroyView(); super.onDestroyView();
} }
private void onConfigLoaded(Config config) { private void onConfigLoaded(final String name, final Config config) {
binding.setConfig(new Config.Observable(config, originalName)); binding.setConfig(new Config.Observable(config, name));
} }
@Override @Override
public void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) { public void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
if (binding != null && isViewStateRestored) { if (binding == null)
return;
binding.setTunnel(newTunnel); binding.setTunnel(newTunnel);
if (newTunnel == null) if (newTunnel == null)
binding.setConfig(null); binding.setConfig(null);
else { else
originalName = newTunnel.getName(); newTunnel.getConfigAsync().thenAccept(a -> onConfigLoaded(newTunnel.getName(), a));
newTunnel.getConfigAsync().thenAccept(this::onConfigLoaded);
}
}
} }
@Override @Override
public void onViewStateRestored(final Bundle savedInstanceState) { public void onViewStateRestored(final Bundle savedInstanceState) {
onSelectedTunnelChanged(null, getSelectedTunnel());
super.onViewStateRestored(savedInstanceState); super.onViewStateRestored(savedInstanceState);
Tunnel tunnel = getSelectedTunnel();
binding.setTunnel(tunnel);
if (tunnel == null)
binding.setConfig(null);
else {
originalName = tunnel.getName();
tunnel.getConfigAsync().thenAccept(this::onConfigLoaded);
}
isViewStateRestored = true;
} }
} }