From 2543f28274b253cd569927a05eff28a541483c60 Mon Sep 17 00:00:00 2001 From: Samuel Holland Date: Sat, 6 Jan 2018 04:30:34 -0600 Subject: [PATCH] MainActivity: Fix ActionBar after rotation Signed-off-by: Samuel Holland --- .../wireguard/android/activity/MainActivity.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/wireguard/android/activity/MainActivity.java b/app/src/main/java/com/wireguard/android/activity/MainActivity.java index e13438d..a905156 100644 --- a/app/src/main/java/com/wireguard/android/activity/MainActivity.java +++ b/app/src/main/java/com/wireguard/android/activity/MainActivity.java @@ -53,14 +53,9 @@ public class MainActivity extends BaseActivity { return true; } state = nextState; - if (state.layer > 1) { - if (getActionBar() != null) - getActionBar().setDisplayHomeAsUpEnabled(true); - } else { - if (getActionBar() != null) - getActionBar().setDisplayHomeAsUpEnabled(false); + if (state.layer <= State.LIST.layer) setSelectedTunnel(null); - } + updateActionBar(); return true; } @@ -82,6 +77,7 @@ public class MainActivity extends BaseActivity { initialState = State.valueOf(getIntent().getStringExtra(KEY_STATE)); moveToState(initialState); } + updateActionBar(); } @Override @@ -124,6 +120,11 @@ public class MainActivity extends BaseActivity { moveToState(newTunnel != null ? State.DETAIL : State.LIST); } + private void updateActionBar() { + if (getActionBar() != null) + getActionBar().setDisplayHomeAsUpEnabled(state.layer > State.LIST.layer); + } + private enum State { EMPTY(null, 0), LIST(TunnelListFragment.class, 1),