Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '782-wrong-item-selected-in-navdrawer-onBackPressed' into 'master'

Browse Source 
Select the correct MenuItem when Back is pressed in NawDrawer

Signed-off-by: goapunk <noobie@goapunks.net>

Closes #782

See merge request !437
This commit is contained in:
Ernir Erlingsson
2016-11-28 08:37:53 +00:00
parent 6436e6688d 47171f3e18
commit 2b9ccb4c42
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/org/briarproject/android/NavDrawerActivity.java
View File

@@ -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);