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

Merge "Reverse FLAG_INCLUDE_QUOTED_TEXT"

Browse Source
This commit is contained in:
Makoto Onuki 2010-11-05 16:44:02 +00:00 committed by Android (Google) Code Review
commit 467eb0cceb
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -559,7 +559,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
mAddressAdapterBcc = new EmailAddressAdapter(this);
}
// TODO: is there any way to unify this with MessageView.LoadMessageTask?
private class LoadMessageTask extends AsyncTask<Void, Void, Object[]> {
private final long mMessageId;
@ -807,9 +806,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
}
if (includeQuotedText()) {
message.mFlags |= Message.FLAG_INCLUDE_QUOTED_TEXT;
message.mFlags &= ~Message.FLAG_NOT_INCLUDE_QUOTED_TEXT;
} else {
message.mFlags &= ~Message.FLAG_INCLUDE_QUOTED_TEXT;
message.mFlags |= Message.FLAG_NOT_INCLUDE_QUOTED_TEXT;
if (sending) {
// If we are about to send a message, and not including the original message,
// clear the related field.
@ -1485,7 +1484,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
*/
if (ACTION_EDIT_DRAFT.equals(mAction)) {
displayQuotedText(message.mTextReply, message.mHtmlReply);
setIncludeQuotedText((mDraft.mFlags & Message.FLAG_INCLUDE_QUOTED_TEXT) != 0);
setIncludeQuotedText((mDraft.mFlags & Message.FLAG_NOT_INCLUDE_QUOTED_TEXT) == 0);
}
}

11
src/com/android/email/provider/EmailContent.java
View File

@ -621,10 +621,13 @@ public abstract class EmailContent {
// 8 general purpose flags (bits) that may be used at the discretion of the sync adapter
public static final int FLAG_SYNC_ADAPTER_SHIFT = 9;
public static final int FLAG_SYNC_ADAPTER_MASK = 255 << FLAG_SYNC_ADAPTER_SHIFT;
// Bit used in mFlags indicating that the outgoing message should include quoted original
// message.
public static final int FLAG_INCLUDE_QUOTED_TEXT_SHIFT = 17;
public static final int FLAG_INCLUDE_QUOTED_TEXT = 1 << FLAG_INCLUDE_QUOTED_TEXT_SHIFT;
/**
* Bit used in mFlags indicating that the outgoing message should *not* include quoted
* original message. ("Not", in order to keep compatibility with old databases)
*/
public static final int FLAG_NOT_INCLUDE_QUOTED_TEXT_SHIFT = 17;
public static final int FLAG_NOT_INCLUDE_QUOTED_TEXT
= 1 << FLAG_NOT_INCLUDE_QUOTED_TEXT_SHIFT;
public Message() {
mBaseUri = CONTENT_URI;