ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MessageCompose: delete the attachments that are removed in the UI. 

Bug 2139949.
This commit is contained in:
Mihai Preda 2009-09-25 14:34:09 +02:00
parent ce3bb9abcc
commit 7768ce276e
2 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/email/Controller.java
View File

@ -539,6 +539,16 @@ public class Controller {
}
}
/**
* Delete a single attachment entry from the DB given its id.
* Does not delete any eventual associated files.
*/
public void deleteAttachment(long attachmentId) {
ContentResolver resolver = mProviderContext.getContentResolver();
Uri uri = ContentUris.withAppendedId(Attachment.CONTENT_URI, attachmentId);
resolver.delete(uri, null, null);
}
/**
* Delete a single message by moving it to the trash, or deleting it from the trash
*

63
src/com/android/email/activity/MessageCompose.java
View File

@ -310,21 +310,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
} else {
setAccount(intent);
}
if (ACTION_EDIT_DRAFT.equals(mAction) && messageId != -1) {
mLoadAttachmentsTask = new AsyncTask<Long, Void, Attachment[]>() {
@Override
protected Attachment[] doInBackground(Long... messageIds) {
return Attachment.restoreAttachmentsWithMessageId(MessageCompose.this,
messageIds[0]);
}
@Override
protected void onPostExecute(Attachment[] attachments) {
for (Attachment attachment : attachments) {
addAttachment(attachment);
}
}
}.execute(messageId);
}
}
if (ACTION_REPLY.equals(mAction) || ACTION_REPLY_ALL.equals(mAction) ||
@ -584,6 +569,21 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
if (ACTION_EDIT_DRAFT.equals(mAction)) {
mDraft = message;
mLoadAttachmentsTask = new AsyncTask<Long, Void, Attachment[]>() {
@Override
protected Attachment[] doInBackground(Long... messageIds) {
return Attachment.restoreAttachmentsWithMessageId(MessageCompose.this,
messageIds[0]);
}
@Override
protected void onPostExecute(Attachment[] attachments) {
if (attachments != null) {
for (Attachment attachment : attachments) {
addAttachment(attachment);
}
}
}
}.execute(message.mId);
} else if (ACTION_REPLY.equals(mAction)
|| ACTION_REPLY_ALL.equals(mAction)
|| ACTION_FORWARD.equals(mAction)) {
@ -792,8 +792,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
// mDraft.mId is set upon return of saveToMailbox()
mController.saveToMailbox(mDraft, EmailContent.Mailbox.TYPE_DRAFTS);
}
// TODO: remove from DB the attachments that were removed from UI
for (Attachment attachment : attachments) {
if (!attachment.isSaved()) {
// this attachment is new so save it to DB.
@ -967,13 +965,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
onDiscard();
break;
case R.id.attachment_delete:
/*
* The view is the delete button, and we have previously set the tag of
* the delete button to the view that owns it. We don't use parent because the
* view is very complex and could change in the future.
*/
mAttachments.removeView((View) view.getTag());
mDraftNeedsSaving = true;
onDeleteAttachment(view);
break;
case R.id.quoted_text_delete:
mQuotedTextBar.setVisibility(View.GONE);
@ -983,6 +975,29 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
}
}
private void onDeleteAttachment(View delButtonView) {
/*
* The view is the delete button, and we have previously set the tag of
* the delete button to the view that owns it. We don't use parent because the
* view is very complex and could change in the future.
*/
View attachmentView = (View) delButtonView.getTag();
Attachment attachment = (Attachment) attachmentView.getTag();
mAttachments.removeView(attachmentView);
if (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.
new AsyncTask<Long, Void, Void>() {
protected Void doInBackground(Long... attachmentIds) {
mController.deleteAttachment(attachmentIds[0]);
return null;
}
}.execute(attachment.mId);
}
mDraftNeedsSaving = true;
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {