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

Select the correct MenuItem when Back is pressed in NawDrawer

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

Closes #782

See merge request !437

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