Clear all "drafts" related flags from email when sending

b/11224331

Change-Id: I1df8ea3e0e24b050cd391dea454124e06988bf7d
This commit is contained in:
Martin Hibdon 2013-10-14 17:40:44 -07:00
parent 8e8b7b5b86
commit 85d2190552
2 changed files with 6 additions and 2 deletions

View File

@ -2221,7 +2221,7 @@ public class EmailProvider extends ContentProvider {
private static final String MESSAGE_DRAFT_TYPE = private static final String MESSAGE_DRAFT_TYPE =
"CASE WHEN (" + MessageColumns.FLAGS + "&" + Message.FLAG_TYPE_ORIGINAL + "CASE WHEN (" + MessageColumns.FLAGS + "&" + Message.FLAG_TYPE_ORIGINAL +
") !=0 THEN " + UIProvider.DraftType.COMPOSE + ") !=0 THEN " + UIProvider.DraftType.COMPOSE +
" WHEN (" + MessageColumns.FLAGS + "&" + (1<<20) + " WHEN (" + MessageColumns.FLAGS + "&" + Message.FLAG_TYPE_REPLY_ALL +
") !=0 THEN " + UIProvider.DraftType.REPLY_ALL + ") !=0 THEN " + UIProvider.DraftType.REPLY_ALL +
" WHEN (" + MessageColumns.FLAGS + "&" + Message.FLAG_TYPE_REPLY + " WHEN (" + MessageColumns.FLAGS + "&" + Message.FLAG_TYPE_REPLY +
") !=0 THEN " + UIProvider.DraftType.REPLY + ") !=0 THEN " + UIProvider.DraftType.REPLY +

View File

@ -63,6 +63,7 @@ import com.android.emailcommon.service.SearchParams;
import com.android.emailcommon.utility.AttachmentUtilities; import com.android.emailcommon.utility.AttachmentUtilities;
import com.android.emailcommon.utility.Utility; import com.android.emailcommon.utility.Utility;
import com.android.mail.providers.UIProvider; import com.android.mail.providers.UIProvider;
import com.android.mail.providers.UIProvider.DraftType;
import com.android.mail.utils.LogUtils; import com.android.mail.utils.LogUtils;
import java.util.HashSet; import java.util.HashSet;
@ -552,7 +553,10 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
messageId); messageId);
} }
final int flags = msg.mFlags & ~(EmailContent.Message.FLAG_TYPE_REPLY | final int flags = msg.mFlags & ~(EmailContent.Message.FLAG_TYPE_REPLY |
EmailContent.Message.FLAG_TYPE_FORWARD); EmailContent.Message.FLAG_TYPE_FORWARD |
EmailContent.Message.FLAG_TYPE_REPLY_ALL |
EmailContent.Message.FLAG_TYPE_ORIGINAL);
moveToSentValues.put(EmailContent.MessageColumns.FLAGS, flags); moveToSentValues.put(EmailContent.MessageColumns.FLAGS, flags);
resolver.update(syncedUri, moveToSentValues, null, null); resolver.update(syncedUri, moveToSentValues, null, null);
} else { } else {