Merge "message "serverId" field is a string, not a long" into jb-ub-mail
diff --git a/res/raw/template_message.html b/res/raw/template_message.html
index 69a25b0..97784ee 100644
--- a/res/raw/template_message.html
+++ b/res/raw/template_message.html
@@ -1,4 +1,4 @@
-<div id="%s" serverId="%s" class="mail-message %s">
+<div id="%s" class="mail-message %s">
<div class="mail-message-header spacer" style="height: %spx;"></div>
<div class="mail-message-content collapsible %s" style="display: %s; zoom: %s; padding: 16px;">%s</div>
<div class="mail-message-footer collapsible" style="display: %s; height: %spx;"></div>
diff --git a/src/com/android/mail/browse/MessageCursor.java b/src/com/android/mail/browse/MessageCursor.java
index 6b14d20..49d750b 100644
--- a/src/com/android/mail/browse/MessageCursor.java
+++ b/src/com/android/mail/browse/MessageCursor.java
@@ -130,7 +130,7 @@
while (moveToPosition(++pos)) {
final Message m = getMessage();
sb.append(String.format(
- "[Message #%d uri=%s id=%d serverId=%d, from='%s' draftType=%d isSending=%s]\n",
+ "[Message #%d uri=%s id=%d serverId=%s, from='%s' draftType=%d isSending=%s]\n",
pos, m.uri, m.id, m.serverId, m.from, m.draftType, m.isSending));
}
return sb.toString();
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index c215ba3..7615550 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -599,7 +599,7 @@
private Message createMessage(ReplyFromAccount selectedReplyFromAccount, int mode) {
Message message = new Message();
message.id = UIProvider.INVALID_MESSAGE_ID;
- message.serverId =UIProvider.INVALID_MESSAGE_ID;
+ message.serverId = null;
message.uri = null;
message.conversationUri = null;
message.subject = mSubject.getText().toString();
@@ -1864,7 +1864,7 @@
// Some text has been added to the message OR
// an attachment has been added or removed
// AND there is actually something in the draft to save.
- return (mTextChanged || mAttachmentsChanged || mReplyFromChanged)
+ return (mTextChanged || mAttachmentsChanged || mReplyFromChanged)
&& !isBlank();
}
}
diff --git a/src/com/android/mail/providers/Message.java b/src/com/android/mail/providers/Message.java
index 1643915..3731c19 100644
--- a/src/com/android/mail/providers/Message.java
+++ b/src/com/android/mail/providers/Message.java
@@ -49,7 +49,7 @@
/**
* @see UIProvider.MessageColumns#SERVER_ID
*/
- public long serverId;
+ public String serverId;
/**
* @see UIProvider.MessageColumns#URI
*/
@@ -216,7 +216,7 @@
@Override
public void writeToParcel(Parcel dest, int flags) {
dest.writeLong(id);
- dest.writeLong(serverId);
+ dest.writeString(serverId);
dest.writeParcelable(uri, 0);
dest.writeParcelable(conversationUri, 0);
dest.writeString(subject);
@@ -252,7 +252,7 @@
private Message(Parcel in) {
id = in.readLong();
- serverId = in.readLong();
+ serverId = in.readString();
uri = in.readParcelable(null);
conversationUri = in.readParcelable(null);
subject = in.readString();
@@ -312,7 +312,7 @@
public Message(Cursor cursor) {
if (cursor != null) {
id = cursor.getLong(UIProvider.MESSAGE_ID_COLUMN);
- serverId = cursor.getLong(UIProvider.MESSAGE_SERVER_ID_COLUMN);
+ serverId = cursor.getString(UIProvider.MESSAGE_SERVER_ID_COLUMN);
final String messageUriStr = cursor.getString(UIProvider.MESSAGE_URI_COLUMN);
uri = !TextUtils.isEmpty(messageUriStr) ? Uri.parse(messageUriStr) : null;
final String convUriStr = cursor.getString(UIProvider.MESSAGE_CONVERSATION_URI_COLUMN);
diff --git a/src/com/android/mail/ui/HtmlConversationTemplates.java b/src/com/android/mail/ui/HtmlConversationTemplates.java
index 16b26b7..1119ebb 100644
--- a/src/com/android/mail/ui/HtmlConversationTemplates.java
+++ b/src/com/android/mail/ui/HtmlConversationTemplates.java
@@ -161,7 +161,6 @@
append(sMessage,
getMessageDomId(message),
- MESSAGE_PREFIX + message.serverId,
expandedClass,
headerHeight,
showImagesClass,