moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-19 20:21:45 -05:00
Code Issues Releases Wiki Activity

remove a pointless indirection and an extra method call to set the

Browse Source 
options menu when we didn't need to
This commit is contained in:
Jesse Vincent 2011-02-11 11:16:50 -05:00
parent 49b35f9236
commit 111b9a6305
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/fsck/k9/activity/MessageView.java
View File

@ -65,7 +65,6 @@ public class MessageView extends K9Activity implements OnClickListener {
private MessagingController mController = MessagingController.getInstance(getApplication()); private MessagingController mController = MessagingController.getInstance(getApplication());
private MessageReference mNextMessage = null; private MessageReference mNextMessage = null;
private MessageReference mPreviousMessage = null; private MessageReference mPreviousMessage = null;
private Menu optionsMenu = null;
private Listener mListener = new Listener(); private Listener mListener = new Listener();
private MessageViewHandler mHandler = new MessageViewHandler(); private MessageViewHandler mHandler = new MessageViewHandler();
private Contacts mContacts; private Contacts mContacts;
@ -754,7 +753,6 @@ public class MessageView extends K9Activity implements OnClickListener {
try { try {
mMessage.setFlag(Flag.FLAGGED, !mMessage.isSet(Flag.FLAGGED)); mMessage.setFlag(Flag.FLAGGED, !mMessage.isSet(Flag.FLAGGED));
mMessageView.setHeaders(mMessage, mAccount); mMessageView.setHeaders(mMessage, mAccount);
prepareMenuItems();
} catch (MessagingException me) { } catch (MessagingException me) {
Log.e(K9.LOG_TAG, "Could not set flag on local message", me); Log.e(K9.LOG_TAG, "Could not set flag on local message", me);
} }
@ -1018,8 +1016,6 @@ public class MessageView extends K9Activity implements OnClickListener {
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
super.onCreateOptionsMenu(menu); super.onCreateOptionsMenu(menu);
getMenuInflater().inflate(R.menu.message_view_option, menu); getMenuInflater().inflate(R.menu.message_view_option, menu);
optionsMenu = menu;
prepareMenuItems();
if (!mController.isCopyCapable(mAccount)) { if (!mController.isCopyCapable(mAccount)) {
menu.findItem(R.id.copy).setVisible(false); menu.findItem(R.id.copy).setVisible(false);
} }
@ -1037,12 +1033,6 @@ public class MessageView extends K9Activity implements OnClickListener {
return true; return true;
} }
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
prepareMenuItems();
return super.onPrepareOptionsMenu(menu);
}
// TODO: when switching to API version 8, override onCreateDialog(int, Bundle) // TODO: when switching to API version 8, override onCreateDialog(int, Bundle)
/** /**
@ -1060,8 +1050,8 @@ public class MessageView extends K9Activity implements OnClickListener {
return super.onCreateDialog(id); return super.onCreateDialog(id);
} }
private void prepareMenuItems() { @Override
Menu menu = optionsMenu; public boolean onPrepareOptionsMenu(Menu menu) {
if (menu != null) { if (menu != null) {
MenuItem flagItem = menu.findItem(R.id.flag); MenuItem flagItem = menu.findItem(R.id.flag);
if (flagItem != null && mMessage != null) { if (flagItem != null && mMessage != null) {
@ -1073,6 +1063,7 @@ public class MessageView extends K9Activity implements OnClickListener {
R.string.hide_full_header_action : R.string.show_full_header_action); R.string.hide_full_header_action : R.string.show_full_header_action);
} }
} }
return super.onPrepareOptionsMenu(menu);
} }
public void displayMessage(Account account, String folder, String uid, Message message) { public void displayMessage(Account account, String folder, String uid, Message message) {