diff --git a/briar-android/src/org/briarproject/android/NavDrawerActivity.java b/briar-android/src/org/briarproject/android/NavDrawerActivity.java index c80310aa0cac726e87c3c3801544a8cd611018f3..d287da3d3540ed27b1436a83eafdad785cedb7ba 100644 --- a/briar-android/src/org/briarproject/android/NavDrawerActivity.java +++ b/briar-android/src/org/briarproject/android/NavDrawerActivity.java @@ -183,12 +183,19 @@ public class NavDrawerActivity extends BriarFragmentActivity implements drawerLayout.closeDrawer(START); clearBackStack(); loadFragment(item.getItemId()); + //Don't display the Settings Item as checked + if(item.getItemId() == R.id.nav_btn_settings){ + return false; + } return true; } @Override public void onBackPressed() { + // Check the Contacts item because we always return to Contacts here + NavigationView navigation = (NavigationView) findViewById(R.id.navigation); + navigation.getMenu().findItem(R.id.nav_btn_contacts).setChecked(true); if (getSupportFragmentManager().getBackStackEntryCount() == 0 && drawerLayout.isDrawerOpen(START)) { drawerLayout.closeDrawer(START);