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

Merge "Add an additional mailbox key column to message table" into jb-ub-mail-ur10

Browse Source
This commit is contained in:
Yu Ping Hu 2013-10-24 22:59:39 +00:00 committed by Android (Google) Code Review
commit 66f85c878c
4 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
emailcommon/src/com/android/emailcommon/provider/EmailContent.java
View File

@ -554,6 +554,10 @@ public abstract class EmailContent {
// References to other Email objects in the database
// Foreign key to the Mailbox holding this message [INDEX]
// TODO: This column is used in a complicated way: Usually, this refers to the mailbox
// the server considers this message to be in. In the case of search results, this key
// will refer to a special "search" mailbox, which does not exist on the server.
// This is confusing and causes problems, see b/11294681.
public static final String MAILBOX_KEY = "mailboxKey";
// Foreign key to the Account holding this message
public static final String ACCOUNT_KEY = "accountKey";
@ -580,6 +584,15 @@ public abstract class EmailContent {
/** Boolean, unseen = 0, seen = 1 [INDEX] */
public static final String FLAG_SEEN = "flagSeen";
// References to other Email objects in the database
// Foreign key to the Mailbox holding this message [INDEX]
// In cases where mailboxKey is NOT the real mailbox the server considers this message in,
// this will be set. See b/11294681
// We'd like to get rid of this column when the other changes mentioned in that bug
// can be addressed.
public static final String MAIN_MAILBOX_KEY = "mainMailboxKey";
}
public static final class Message extends EmailContent implements SyncColumns, MessageColumns {
@ -641,6 +654,7 @@ public abstract class EmailContent {
public static final int CONTENT_THREAD_TOPIC_COLUMN = 23;
public static final int CONTENT_SYNC_DATA_COLUMN = 24;
public static final int CONTENT_FLAG_SEEN_COLUMN = 25;
public static final int CONTENT_MAIN_MAILBOX_KEY_COLUMN = 26;
public static final String[] CONTENT_PROJECTION = new String[] {
RECORD_ID,
@ -655,7 +669,8 @@ public abstract class EmailContent {
MessageColumns.BCC_LIST, MessageColumns.REPLY_TO_LIST,
SyncColumns.SERVER_TIMESTAMP, MessageColumns.MEETING_INFO,
MessageColumns.SNIPPET, MessageColumns.PROTOCOL_SEARCH_INFO,
MessageColumns.THREAD_TOPIC, MessageColumns.SYNC_DATA, MessageColumns.FLAG_SEEN
MessageColumns.THREAD_TOPIC, MessageColumns.SYNC_DATA,
MessageColumns.FLAG_SEEN, MessageColumns.MAIN_MAILBOX_KEY
};
public static final int LIST_ID_COLUMN = 0;
@ -775,6 +790,7 @@ public abstract class EmailContent {
public long mMailboxKey;
public long mAccountKey;
public long mMainMailboxKey;
public String mFrom;
public String mTo;
@ -905,6 +921,7 @@ public abstract class EmailContent {
values.put(MessageColumns.PROTOCOL_SEARCH_INFO, mProtocolSearchInfo);
values.put(MessageColumns.THREAD_TOPIC, mThreadTopic);
values.put(MessageColumns.SYNC_DATA, mSyncData);
values.put(MessageColumns.MAIN_MAILBOX_KEY, mMainMailboxKey);
return values;
}
@ -931,6 +948,7 @@ public abstract class EmailContent {
mDraftInfo = cursor.getInt(CONTENT_DRAFT_INFO_COLUMN);
mMessageId = cursor.getString(CONTENT_MESSAGE_ID_COLUMN);
mMailboxKey = cursor.getLong(CONTENT_MAILBOX_KEY_COLUMN);
mMainMailboxKey = cursor.getLong(CONTENT_MAIN_MAILBOX_KEY_COLUMN);
mAccountKey = cursor.getLong(CONTENT_ACCOUNT_KEY_COLUMN);
mFrom = cursor.getString(CONTENT_FROM_LIST_COLUMN);
mTo = cursor.getString(CONTENT_TO_LIST_COLUMN);

24
src/com/android/email/provider/DBHelper.java
View File

@ -156,7 +156,10 @@ public final class DBHelper {
// Version 118: Set syncInterval to 0 for all IMAP mailboxes
// Version 119: Disable syncing of DRAFTS type folders.
// Version 120: Changed duplicateMessage deletion trigger to ignore search mailboxes.
public static final int DATABASE_VERSION = 120;
// Version 121: Add mainMailboxKey, which will be set for messages that are in the fake
// "search_results" folder to reflect the mailbox that the server considers
// the message to be in. Also, wipe out any stale search_result folders.
public static final int DATABASE_VERSION = 121;
// Any changes to the database format *must* include update-in-place code.
// Original version: 2
@ -261,7 +264,8 @@ public final class DBHelper {
+ MessageColumns.PROTOCOL_SEARCH_INFO + " text, "
+ MessageColumns.THREAD_TOPIC + " text, "
+ MessageColumns.SYNC_DATA + " text, "
+ MessageColumns.FLAG_SEEN + " integer"
+ MessageColumns.FLAG_SEEN + " integer, "
+ MessageColumns.MAIN_MAILBOX_KEY + " integer"
+ ");";
// This String and the following String MUST have the same columns, except for the type
@ -1266,6 +1270,22 @@ public final class DBHelper {
createDeleteDuplicateMessagesTrigger(db);
}
// Add the mainMailboxKey column, and get rid of any messages in the search_results
// folder.
//
if (oldVersion <= 120) {
db.execSQL("alter table " + Message.TABLE_NAME
+ " add " + MessageColumns.MAIN_MAILBOX_KEY + " integer");
// Delete all TYPE_SEARCH mailboxes. These will be for stale queries anyway, and
// the messages in them will not have the mainMailboxKey column correctly populated.
// We have a trigger (See TRIGGER_MAILBOX_DELETE) that will delete any messages
// in the deleted mailboxes.
db.execSQL("delete from " + Mailbox.TABLE_NAME + " where "
+ Mailbox.TYPE + "=" + Mailbox.TYPE_SEARCH);
}
}
@Override

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

@ -228,7 +228,7 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
new String[] {BodyColumns.SOURCE_MESSAGE_KEY},
BodyColumns.MESSAGE_KEY + "=?",
new String[] {Long.toString(messageId)}, null, 0, -1L);
if (sourceId != -1 ) {
if (sourceId != -1) {
EmailContent.Message sourceMsg =
EmailContent.Message.restoreMessageWithId(mContext, sourceId);
if (sourceMsg != null) {
@ -236,6 +236,8 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
message.mServerId = sourceMsg.mServerId;
}
}
} else if (mailbox.mType == Mailbox.TYPE_SEARCH && message.mMainMailboxKey != 0) {
mailbox = Mailbox.restoreMailboxWithId(mContext, message.mMainMailboxKey);
}
if (account == null || mailbox == null) {
@ -262,6 +264,7 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
String.format("%s;\n name=\"%s\"",
attachment.mMimeType,
attachment.mFileName));
// TODO is this always true for attachments? I think we dropped the
// true encoding along the way
storePart.setHeader(MimeHeader.HEADER_CONTENT_TRANSFER_ENCODING, "base64");

4
src/com/android/email/service/ImapService.java
View File

@ -1480,6 +1480,10 @@ public class ImapService extends Service {
// Copy the fields that are available into the message
LegacyConversions.updateMessageFields(localMessage,
message, account.mId, mailbox.mId);
// Save off the mailbox that this message *really* belongs in.
// We need this information if we need to do more lookups
// (like loading attachments) for this message. See b/11294681
localMessage.mMainMailboxKey = localMessage.mMailboxKey;
localMessage.mMailboxKey = destMailboxId;
// We load 50k or so; maybe it's complete, maybe not...
int flag = EmailContent.Message.FLAG_LOADED_COMPLETE;