1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 00:58:50 -05:00

better guarding for the folders menu item in the face of search folders with multiple accounts

This commit is contained in:
Jesse Vincent 2013-07-02 13:14:43 -04:00 committed by cketti
parent ab1f74f04c
commit 721744f9f7

View File

@ -604,7 +604,7 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
return true; return true;
} }
case KeyEvent.KEYCODE_Q: { case KeyEvent.KEYCODE_Q: {
onShowFolderList(); goBack();
return true; return true;
} }
case KeyEvent.KEYCODE_O: { case KeyEvent.KEYCODE_O: {
@ -1057,11 +1057,13 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
menu.findItem(R.id.send_messages).setVisible(false); menu.findItem(R.id.send_messages).setVisible(false);
menu.findItem(R.id.expunge).setVisible(false); menu.findItem(R.id.expunge).setVisible(false);
menu.findItem(R.id.mark_all_as_read).setVisible(false); menu.findItem(R.id.mark_all_as_read).setVisible(false);
menu.findItem(R.id.show_folder_list).setVisible(false);
} else { } else {
menu.findItem(R.id.set_sort).setVisible(true); menu.findItem(R.id.set_sort).setVisible(true);
menu.findItem(R.id.select_all).setVisible(true); menu.findItem(R.id.select_all).setVisible(true);
menu.findItem(R.id.mark_all_as_read).setVisible( menu.findItem(R.id.mark_all_as_read).setVisible(
mMessageListFragment.isMarkAllAsReadSupported()); mMessageListFragment.isMarkAllAsReadSupported());
menu.findItem(R.id.show_folder_list).setVisible(mAccount == null ? false : true);
if (!mMessageListFragment.isSingleAccountMode()) { if (!mMessageListFragment.isSingleAccountMode()) {
menu.findItem(R.id.expunge).setVisible(false); menu.findItem(R.id.expunge).setVisible(false);