From cfcd36f21a2ab41a67b20f80315190365ba93cff Mon Sep 17 00:00:00 2001 From: goapunk <noobie@goapunks.net> Date: Mon, 28 Nov 2016 16:29:41 +0100 Subject: [PATCH] Fix Contacts Item always beeing selected if Back is pressed in the NavMenu Signed-off-by: goapunk <noobie@goapunks.net> --- .../src/org/briarproject/android/NavDrawerActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/briar-android/src/org/briarproject/android/NavDrawerActivity.java b/briar-android/src/org/briarproject/android/NavDrawerActivity.java index d287da3d35..b84afd8b96 100644 --- a/briar-android/src/org/briarproject/android/NavDrawerActivity.java +++ b/briar-android/src/org/briarproject/android/NavDrawerActivity.java @@ -193,14 +193,14 @@ public class NavDrawerActivity extends BriarFragmentActivity implements @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); return; } + // 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); super.onBackPressed(); } -- GitLab