moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed actionbar context mode bug when rotating the screen.

This commit is contained in:
Sander Bogaert 2012-07-20 15:33:36 -04:00 committed by Andrew Chen
parent f11e3d5059
commit 33cae2fdab
1 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/com/fsck/k9/activity/MessageList.java
View File

@ -691,6 +691,13 @@ public class MessageList extends K9ListActivity implements
int position, long id) {
return handleContextRelatedClick(position);
}});
// Correcting for screen rotation when in ActionMode
mSelectedCount = getSelectionFromCheckboxes().size();
if (mSelectedCount > 0) {
mActionMode = MessageList.this.startActionMode(mActionModeCallback);
mActionMode.setTitle(mSelectedCount+" "+getString(R.string.actionbar_selected));
}
}
@Override
@ -1543,6 +1550,40 @@ public class MessageList extends K9ListActivity implements
return true;
}
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
if (mQueryString != null) {
menu.findItem(R.id.mark_all_as_read).setVisible(false);
menu.findItem(R.id.expunge).setVisible(false);
menu.findItem(R.id.check_mail).setVisible(false);
menu.findItem(R.id.send_messages).setVisible(false);
menu.findItem(R.id.folder_settings).setVisible(false);
menu.findItem(R.id.account_settings).setVisible(false);
} else {
if (mCurrentFolder != null && mCurrentFolder.name.equals(mAccount.getOutboxFolderName())) {
menu.findItem(R.id.check_mail).setVisible(false);
} else {
menu.findItem(R.id.send_messages).setVisible(false);
}
if (mCurrentFolder != null && K9.ERROR_FOLDER_NAME.equals(mCurrentFolder.name)) {
menu.findItem(R.id.expunge).setVisible(false);
}
if (!mController.isMoveCapable(mAccount)) {
// FIXME: Really we want to do this for all local-only folders
if (mCurrentFolder != null &&
!mAccount.getInboxFolderName().equals(mCurrentFolder.name)) {
menu.findItem(R.id.check_mail).setVisible(false);
}
menu.findItem(R.id.expunge).setVisible(false);
}
}
return true;
}
@Override
public void onSwipeRightToLeft(final MotionEvent e1, final MotionEvent e2) {
// Handle right-to-left as an un-select