From 47171f3e181fd69316495fafd4e87181114f2f53 Mon Sep 17 00:00:00 2001
From: goapunk <noobie@goapunks.net>
Date: Sat, 26 Nov 2016 23:09:07 +0100
Subject: [PATCH] Select the correct MenuItem when Back is pressed in NawDrawer
Signed-off-by: goapunk <noobie@goapunks.net>
---
.../src/org/briarproject/android/NavDrawerActivity.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/briar-android/src/org/briarproject/android/NavDrawerActivity.java b/briar-android/src/org/briarproject/android/NavDrawerActivity.java
index c80310aa0c..d287da3d35 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);
--
GitLab