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

am 85d21905: Clear all "drafts" related flags from email when sending 

* commit '85d2190552d05dbc06518bdc21674c6aabeb583b':
  Clear all "drafts" related flags from email when sending
This commit is contained in:
Martin Hibdon 2013-10-14 18:01:46 -07:00 committed by Android Git Automerger
parent 6d3fa53111 85d2190552
commit 28dd863c18
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/email/provider/EmailProvider.java
View File

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

6
src/com/android/email/service/EmailServiceStub.java
View File

@ -63,6 +63,7 @@ import com.android.emailcommon.service.SearchParams;
import com.android.emailcommon.utility.AttachmentUtilities;
import com.android.emailcommon.utility.Utility;
import com.android.mail.providers.UIProvider;
import com.android.mail.providers.UIProvider.DraftType;
import com.android.mail.utils.LogUtils;
import java.util.HashSet;
@ -552,7 +553,10 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
messageId);
}
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);
resolver.update(syncedUri, moveToSentValues, null, null);
} else {