am ccc0e10b: Merge "Only delete attachments from drafts" into honeycomb-mr1

* commit 'ccc0e10bc7b62e38aa0c329e69941bcda9b338e4':
  Only delete attachments from drafts
This commit is contained in:
Todd Kennedy 2011-03-08 11:04:29 -08:00 committed by Android Git Automerger
commit 0c149eef41

View File

@ -1251,7 +1251,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
Attachment attachment = (Attachment) attachmentView.getTag();
mAttachments.removeView(attachmentView);
updateAttachmentContainer();
if (attachment.isSaved()) {
if (attachment.mMessageKey == mDraft.mId && attachment.isSaved()) {
// The following async task for deleting attachments:
// - can be started multiple times in parallel (to delete multiple attachments).
// - need not be interrupted on activity exit, instead should run to completion.