diff options
Diffstat (limited to 'src/com')
11 files changed, 32 insertions, 232 deletions
diff --git a/src/com/android/mail/browse/AttachmentActionHandler.java b/src/com/android/mail/browse/AttachmentActionHandler.java index 2b1723de6..9c1fa0064 100644 --- a/src/com/android/mail/browse/AttachmentActionHandler.java +++ b/src/com/android/mail/browse/AttachmentActionHandler.java @@ -88,7 +88,7 @@ public class AttachmentActionHandler { mAttachment.destination == destination)) { mView.viewAttachment(); } else { - showDownloadingDialog(false); + showDownloadingDialog(); startDownloadingAttachment(destination); } } @@ -138,11 +138,8 @@ public class AttachmentActionHandler { /** * Displays a loading dialog to be used for downloading attachments. * Must be called on the UI thread. - * - * @param isForLoadRestOfMessage If the dialog is showed for load the rest of the message - * {@code true} or just for attachments {@code false} */ - public DialogFragment showDownloadingDialog(boolean isForLoadRestOfMessage) { + public void showDownloadingDialog() { final FragmentTransaction ft = mFragmentManager.beginTransaction(); final Fragment prev = mFragmentManager.findFragmentByTag(PROGRESS_FRAGMENT_TAG); if (prev != null) { @@ -152,9 +149,8 @@ public class AttachmentActionHandler { // Create and show the dialog. final DialogFragment newFragment = AttachmentProgressDialogFragment.newInstance( - mAttachment, isForLoadRestOfMessage); + mAttachment); newFragment.show(ft, PROGRESS_FRAGMENT_TAG); - return newFragment; } /** diff --git a/src/com/android/mail/browse/AttachmentProgressDialogFragment.java b/src/com/android/mail/browse/AttachmentProgressDialogFragment.java index e6c4bbc7b..81a3f6c9e 100644 --- a/src/com/android/mail/browse/AttachmentProgressDialogFragment.java +++ b/src/com/android/mail/browse/AttachmentProgressDialogFragment.java @@ -33,12 +33,10 @@ public class AttachmentProgressDialogFragment extends DialogFragment { private AttachmentCommandHandler mCommandHandler; private Attachment mAttachment; - private boolean mIsForLoadRestOfMessage; private ProgressDialog mDialog; - static AttachmentProgressDialogFragment newInstance(Attachment attachment, - boolean isForLoadRestOfMessage) { + static AttachmentProgressDialogFragment newInstance(Attachment attachment) { final AttachmentProgressDialogFragment f = new AttachmentProgressDialogFragment(); // Supply the attachment as an argument. @@ -68,8 +66,7 @@ public class AttachmentProgressDialogFragment extends DialogFragment { @Override public Dialog onCreateDialog(final Bundle savedInstanceState) { mDialog = new ProgressDialog(getActivity()); - mDialog.setTitle(mIsForLoadRestOfMessage ? R.string.fetching_message - : R.string.fetching_attachment); + mDialog.setTitle(R.string.fetching_attachment); mDialog.setMessage(mAttachment.getName()); mDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); mDialog.setIndeterminate(true); diff --git a/src/com/android/mail/browse/ConversationMessage.java b/src/com/android/mail/browse/ConversationMessage.java index 01243f5a4..e9aa875a1 100644 --- a/src/com/android/mail/browse/ConversationMessage.java +++ b/src/com/android/mail/browse/ConversationMessage.java @@ -72,7 +72,7 @@ public final class ConversationMessage extends Message { * */ public int getStateHashCode() { - return Objects.hashCode(uri, loaded, read, starred, getAttachmentsStateHashCode()); + return Objects.hashCode(uri, read, starred, getAttachmentsStateHashCode()); } private int getAttachmentsStateHashCode() { diff --git a/src/com/android/mail/browse/MessageAttachmentBar.java b/src/com/android/mail/browse/MessageAttachmentBar.java index 41c880a65..cfcbb34b7 100644 --- a/src/com/android/mail/browse/MessageAttachmentBar.java +++ b/src/com/android/mail/browse/MessageAttachmentBar.java @@ -90,7 +90,6 @@ public class MessageAttachmentBar extends FrameLayout implements OnClickListener super(context, attrs); mActionHandler = new AttachmentActionHandler(context, this); - mActionHandler.setViewOnFinish(false); } public void initialize(FragmentManager fragmentManager) { @@ -109,8 +108,6 @@ public class MessageAttachmentBar extends FrameLayout implements OnClickListener * cause sub-views to update. */ public void render(Attachment attachment, Uri accountUri, boolean loaderResult) { - mActionHandler.setViewOnFinish(false); - // get account uri for potential eml viewer usage mAccountUri = accountUri; @@ -173,7 +170,6 @@ public class MessageAttachmentBar extends FrameLayout implements OnClickListener } private boolean onClick(final int res, final View v) { - mActionHandler.setViewOnFinish(true); if (res == R.id.preview_attachment) { previewAttachment(); } else if (res == R.id.save_attachment) { @@ -187,7 +183,7 @@ public class MessageAttachmentBar extends FrameLayout implements OnClickListener } } else if (res == R.id.download_again) { if (mAttachment.isPresentLocally()) { - mActionHandler.showDownloadingDialog(false); + mActionHandler.showDownloadingDialog(); mActionHandler.startRedownloadingAttachment(mAttachment); Analytics.getInstance().sendEvent("redownload_attachment", @@ -230,7 +226,7 @@ public class MessageAttachmentBar extends FrameLayout implements OnClickListener if ((mAttachment.flags & Attachment.FLAG_DUMMY_ATTACHMENT) != 0) { // This is a dummy. We need to download it, but not attempt to open or preview. - mActionHandler.showDownloadingDialog(false); + mActionHandler.showDownloadingDialog(); mActionHandler.setViewOnFinish(false); mActionHandler.startDownloadingAttachment(AttachmentDestination.CACHE); @@ -316,7 +312,6 @@ public class MessageAttachmentBar extends FrameLayout implements OnClickListener @Override public void viewAttachment() { -System.out.println("JRC::viewAttachment(): " + mAttachment.contentUri); if (mAttachment.contentUri == null) { LogUtils.e(LOG_TAG, "viewAttachment with null content uri"); return; @@ -347,7 +342,6 @@ System.out.println("JRC::viewAttachment(): " + mAttachment.contentUri); private void previewAttachment() { if (mAttachment.canPreview()) { -System.out.println("JRC::previewAttachment(): " + mAttachment.previewIntentUri); final Intent previewIntent = new Intent(Intent.ACTION_VIEW, mAttachment.previewIntentUri); getContext().startActivity(previewIntent); diff --git a/src/com/android/mail/browse/MessageCursor.java b/src/com/android/mail/browse/MessageCursor.java index e41108f92..5a4146a7b 100644 --- a/src/com/android/mail/browse/MessageCursor.java +++ b/src/com/android/mail/browse/MessageCursor.java @@ -84,15 +84,6 @@ public class MessageCursor extends ObjectCursor<ConversationMessage> { return false; } - public boolean isConversationLoaded() { - int pos = -1; - while (moveToPosition(++pos)) { - if (!getMessage().loaded) { - return false; - } - } - return true; - } public boolean isConversationRead() { int pos = -1; @@ -169,9 +160,9 @@ public class MessageCursor extends ObjectCursor<ConversationMessage> { } sb.append(String.format( "[Message #%d hash=%s uri=%s id=%s serverId=%s from='%s' draftType=%d" + - " isSending=%s loaded=%s read=%s starred=%s attUris=%s]\n", + " isSending=%s read=%s starred=%s attUris=%s]\n", pos, m.getStateHashCode(), m.uri, m.id, m.serverId, m.getFrom(), m.draftType, - m.isSending, m.loaded, m.read, m.starred, attUris)); + m.isSending, m.read, m.starred, attUris)); } return sb.toString(); } diff --git a/src/com/android/mail/browse/MessageFooterView.java b/src/com/android/mail/browse/MessageFooterView.java index 50d27ea6f..a3f851641 100644 --- a/src/com/android/mail/browse/MessageFooterView.java +++ b/src/com/android/mail/browse/MessageFooterView.java @@ -24,14 +24,12 @@ import android.content.Loader; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.emailcommon.provider.EmailContent; import com.android.mail.R; import com.android.mail.browse.AttachmentLoader.AttachmentCursor; import com.android.mail.browse.ConversationContainer.DetachListener; @@ -56,7 +54,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener, private LoaderManager mLoaderManager; private FragmentManager mFragmentManager; private AttachmentCursor mAttachmentsCursor; - private MessageLoadMoreBar mLoadMore; private TextView mTitleText; private AttachmentTileGrid mAttachmentGrid; private LinearLayout mAttachmentBarList; @@ -81,7 +78,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener, protected void onFinishInflate() { super.onFinishInflate(); - mLoadMore = (MessageLoadMoreBar)findViewById(R.id.message_load_more); mTitleText = (TextView) findViewById(R.id.attachments_header_text); mAttachmentGrid = (AttachmentTileGrid) findViewById(R.id.attachment_tile_grid); mAttachmentBarList = (LinearLayout) findViewById(R.id.attachment_bar_list); @@ -90,7 +86,6 @@ public class MessageFooterView extends LinearLayout implements DetachListener, public void initialize(LoaderManager loaderManager, FragmentManager fragmentManager) { mLoaderManager = loaderManager; mFragmentManager = fragmentManager; - mLoadMore.initialize(fragmentManager); } public void bind(MessageHeaderItem headerItem, Uri accountUri, boolean measureOnly) { @@ -107,41 +102,17 @@ public class MessageFooterView extends LinearLayout implements DetachListener, headerItem.getMessage().attachmentListUri)) { mAttachmentGrid.removeAllViewsInLayout(); mAttachmentBarList.removeAllViewsInLayout(); - mLoadMore.setVisibility(View.GONE); mTitleText.setVisibility(View.GONE); mAttachmentGrid.setVisibility(View.GONE); mAttachmentBarList.setVisibility(View.GONE); } - mMessageHeaderItem = headerItem; - - Message msg = mMessageHeaderItem.getMessage(); - if (!msg.loaded) { - mLoadMore.setVisibility(View.VISIBLE); - - // We need to load the dummy attachment - requestLoader(measureOnly); - - } else { - mLoadMore.setVisibility(View.GONE); - - // Request load of attachment - requestLoader(measureOnly); - - // Do an initial render if initLoader didn't already do one - if (mAttachmentGrid.getChildCount() == 0 && - mAttachmentBarList.getChildCount() == 0) { - renderAttachments(false); - } - } - setVisibility(mMessageHeaderItem.isExpanded() ? VISIBLE : GONE); - } - - private void requestLoader(boolean measureOnly) { // If this MessageFooterView is being bound to a new attachment, we need to unbind with the // old loader final Integer oldAttachmentLoaderId = getAttachmentLoaderId(); + mMessageHeaderItem = headerItem; + final Integer attachmentLoaderId = getAttachmentLoaderId(); // Destroy the loader if we are attempting to load a different attachment if (oldAttachmentLoaderId != null && @@ -156,6 +127,13 @@ public class MessageFooterView extends LinearLayout implements DetachListener, attachmentLoaderId); mLoaderManager.initLoader(attachmentLoaderId, Bundle.EMPTY, this); } + + // Do an initial render if initLoader didn't already do one + if (mAttachmentGrid.getChildCount() == 0 && + mAttachmentBarList.getChildCount() == 0) { + renderAttachments(false); + } + setVisibility(mMessageHeaderItem.isExpanded() ? VISIBLE : GONE); } private void renderAttachments(boolean loaderResult) { @@ -179,42 +157,24 @@ public class MessageFooterView extends LinearLayout implements DetachListener, return; } - final Message msg = mMessageHeaderItem.getMessage(); - - // filter the attachments into tiled and non-tiled final int maxSize = attachments.size(); final List<Attachment> tiledAttachments = new ArrayList<Attachment>(maxSize); final List<Attachment> barAttachments = new ArrayList<Attachment>(maxSize); for (Attachment attachment : attachments) { - // We don't need to show dummy or incomplete attachments. We have a load more - // to load the rest of the message - if (TextUtils.isEmpty(attachment.getName()) || - (attachment.flags & EmailContent.Attachment.FLAG_DUMMY_ATTACHMENT) == - EmailContent.Attachment.FLAG_DUMMY_ATTACHMENT) { - continue; - } if (AttachmentTile.isTiledAttachment(attachment)) { tiledAttachments.add(attachment); } else { barAttachments.add(attachment); } } - msg.attachmentsJson = Attachment.toJSONArray(attachments); + mMessageHeaderItem.getMessage().attachmentsJson = Attachment.toJSONArray(attachments); - int tiledAttachmentsCount = tiledAttachments.size(); - int barAttachmentsCount = barAttachments.size(); - if (tiledAttachmentsCount + barAttachmentsCount > 0) { - mTitleText.setVisibility(View.VISIBLE); - } + mTitleText.setVisibility(View.VISIBLE); - if (tiledAttachmentsCount > 0) { - renderTiledAttachments(tiledAttachments, loaderResult); - } - if (barAttachmentsCount > 0) { - renderBarAttachments(barAttachments, loaderResult); - } + renderTiledAttachments(tiledAttachments, loaderResult); + renderBarAttachments(barAttachments, loaderResult); } private void renderTiledAttachments(List<Attachment> tiledAttachments, boolean loaderResult) { @@ -268,18 +228,10 @@ public class MessageFooterView extends LinearLayout implements DetachListener, public void onLoadFinished(Loader<Cursor> loader, Cursor data) { mAttachmentsCursor = (AttachmentCursor) data; - if (mMessageHeaderItem == null || mAttachmentsCursor == null - || mAttachmentsCursor.isClosed()) { + if (mAttachmentsCursor == null || mAttachmentsCursor.isClosed()) { return; } - final Message msg = mMessageHeaderItem.getMessage(); - if (msg.loaded) { - mLoadMore.onMessageLoaded(); - } else { - mAttachmentsCursor.moveToPosition(0); - mLoadMore.setAttachment(mAttachmentsCursor.get()); - } renderAttachments(true); } diff --git a/src/com/android/mail/browse/MessageLoadMoreBar.java b/src/com/android/mail/browse/MessageLoadMoreBar.java deleted file mode 100644 index 6e11dad9e..000000000 --- a/src/com/android/mail/browse/MessageLoadMoreBar.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2012 Google Inc. - * Licensed to The Android Open Source Project. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.mail.browse; - -import android.app.DialogFragment; -import android.app.FragmentManager; -import android.content.Context; -import android.os.Handler; -import android.util.AttributeSet; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.FrameLayout; - -import com.android.mail.providers.Attachment; -import com.android.mail.providers.UIProvider.AttachmentDestination; - -public class MessageLoadMoreBar extends FrameLayout implements OnClickListener, - AttachmentViewInterface { - - private final AttachmentActionHandler mActionHandler; - private DialogFragment mDialog; - private Handler mHandler; - - public MessageLoadMoreBar(Context context) { - this(context, null); - } - - public MessageLoadMoreBar(Context context, AttributeSet attrs) { - super(context, attrs); - - mActionHandler = new AttachmentActionHandler(context, this); - mHandler = new Handler(); - } - - public void initialize(FragmentManager fragmentManager) { - mActionHandler.initialize(fragmentManager); - } - - public void setAttachment(Attachment attachment) { - mActionHandler.setAttachment(attachment); - } - - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - setOnClickListener(this); - } - - @Override - public void onClick(View v) { - if (mDialog != null) { - mDialog.dismiss(); - } - mDialog = mActionHandler.showDownloadingDialog(true); - mActionHandler.setViewOnFinish(false); - mActionHandler.startDownloadingAttachment(AttachmentDestination.CACHE); - } - - public void onMessageLoaded() { - // This method is invoked from the onLoadFinished method, so it's must be - // called in the uithread to dismiss the dialog - mHandler.post(new Runnable() { - @Override - public void run() { - if (mDialog != null) { - mDialog.dismiss(); - } - mDialog = null; - } - }); - } - - @Override - public void viewAttachment() { - } - - @Override - public void updateProgress(boolean showDeterminateProgress) { - } - - @Override - public void onUpdateStatus() { - } - -} diff --git a/src/com/android/mail/providers/Message.java b/src/com/android/mail/providers/Message.java index a3c80aec2..4b70d34fa 100644 --- a/src/com/android/mail/providers/Message.java +++ b/src/com/android/mail/providers/Message.java @@ -35,7 +35,6 @@ import com.android.emailcommon.internet.MimeMessage; import com.android.emailcommon.internet.MimeUtility; import com.android.emailcommon.mail.MessagingException; import com.android.emailcommon.mail.Part; -import com.android.emailcommon.provider.EmailContent; import com.android.emailcommon.utility.ConversionUtilities; import com.android.mail.providers.UIProvider.MessageColumns; import com.android.mail.ui.HtmlMessage; @@ -148,10 +147,6 @@ public class Message implements Parcelable, HtmlMessage { */ public boolean alwaysShowImages; /** - * @see UIProvider.MessageColumns#LOADED - */ - public boolean loaded; - /** * @see UIProvider.MessageColumns#READ */ public boolean read; @@ -259,7 +254,6 @@ public class Message implements Parcelable, HtmlMessage { dest.writeInt(spamLinkType); dest.writeString(viaDomain); dest.writeInt(isSending ? 1 : 0); - dest.writeInt(loaded ? 1 : 0); } private Message(Parcel in) { @@ -294,7 +288,6 @@ public class Message implements Parcelable, HtmlMessage { spamLinkType = in.readInt(); viaDomain = in.readString(); isSending = in.readInt() != 0; - loaded = in.readInt() != 0; } public Message() { @@ -369,8 +362,6 @@ public class Message implements Parcelable, HtmlMessage { spamLinkType = cursor.getInt(UIProvider.MESSAGE_SPAM_WARNING_LINK_TYPE_COLUMN); viaDomain = cursor.getString(UIProvider.MESSAGE_VIA_DOMAIN_COLUMN); isSending = cursor.getInt(UIProvider.MESSAGE_IS_SENDING_COLUMN) != 0; - loaded = cursor.getInt(UIProvider.MESSAGE_LOADED_COLUMN) == - EmailContent.Message.FLAG_LOADED_COMPLETE; } } diff --git a/src/com/android/mail/providers/MessageInfo.java b/src/com/android/mail/providers/MessageInfo.java index a0ebc34f8..b197b7cd9 100644 --- a/src/com/android/mail/providers/MessageInfo.java +++ b/src/com/android/mail/providers/MessageInfo.java @@ -24,7 +24,6 @@ import com.google.common.base.Objects; public class MessageInfo implements Parcelable { public static final String SENDER_LIST_TOKEN_ELIDED = " .. "; - public boolean loaded; public boolean read; public boolean starred; public String sender; @@ -35,8 +34,8 @@ public class MessageInfo implements Parcelable { } public MessageInfo(boolean isRead, boolean isStarred, String senderString, int p, - String email, boolean loaded) { - set(isRead, isStarred, senderString, p, email, loaded); + String email) { + set(isRead, isStarred, senderString, p, email); } private MessageInfo(Parcel in) { @@ -45,7 +44,6 @@ public class MessageInfo implements Parcelable { sender = in.readString(); priority = in.readInt(); senderEmail = in.readString(); - loaded = (in.readInt() != 0); } @Override @@ -60,17 +58,14 @@ public class MessageInfo implements Parcelable { dest.writeString(sender); dest.writeInt(priority); dest.writeString(senderEmail); - dest.writeInt(loaded ? 1 : 0); } - public void set(boolean isRead, boolean isStarred, String senderString, int p, - String email, boolean isLoaded) { + public void set(boolean isRead, boolean isStarred, String senderString, int p, String email) { read = isRead; starred = isStarred; sender = senderString; priority = p; senderEmail = email; - loaded = isLoaded; } public boolean markRead(boolean isRead) { @@ -83,7 +78,7 @@ public class MessageInfo implements Parcelable { @Override public int hashCode() { - return Objects.hashCode(loaded, read, starred, sender, senderEmail, priority); + return Objects.hashCode(read, starred, sender, senderEmail); } public static final Creator<MessageInfo> CREATOR = new Creator<MessageInfo>() { @@ -111,8 +106,6 @@ public class MessageInfo implements Parcelable { builder.append(senderEmail); builder.append(", priority = "); builder.append(priority); - builder.append(", loaded = "); - builder.append(loaded); builder.append("]"); return builder.toString(); } diff --git a/src/com/android/mail/providers/UIProvider.java b/src/com/android/mail/providers/UIProvider.java index 50d1a028e..e4bc961e5 100644 --- a/src/com/android/mail/providers/UIProvider.java +++ b/src/com/android/mail/providers/UIProvider.java @@ -998,7 +998,6 @@ public class UIProvider { ConversationColumns.ATTACHMENT_PREVIEW_URI1, ConversationColumns.ATTACHMENT_PREVIEW_STATES, ConversationColumns.ATTACHMENT_PREVIEWS_COUNT, - ConversationColumns.LOADED }; /** @@ -1146,11 +1145,6 @@ public class UIProvider { public static final String PRIORITY = "priority"; /** - * This int column indicates whether the conversation has been loaded - */ - public static final String LOADED = "loaded"; - - /** * This int column indicates whether the conversation has been read */ public static final String READ = "read"; @@ -1544,8 +1538,7 @@ public class UIProvider { MessageColumns.SPAM_WARNING_LEVEL, MessageColumns.SPAM_WARNING_LINK_TYPE, MessageColumns.VIA_DOMAIN, - MessageColumns.IS_SENDING, - MessageColumns.LOADED + MessageColumns.IS_SENDING }; /** Separates attachment info parts in strings in a message. */ @@ -1591,7 +1584,6 @@ public class UIProvider { public static final int MESSAGE_SPAM_WARNING_LINK_TYPE_COLUMN = 32; public static final int MESSAGE_VIA_DOMAIN_COLUMN = 33; public static final int MESSAGE_IS_SENDING_COLUMN = 34; - public static final int MESSAGE_LOADED_COLUMN = 35; public static final class CursorStatus { // The cursor is actively loading more data @@ -1741,11 +1733,6 @@ public class UIProvider { public static final String ALWAYS_SHOW_IMAGES = "alwaysShowImages"; /** - * This boolean column indicates whether the message has been loaded - */ - public static final String LOADED = "loaded"; - - /** * This boolean column indicates whether the message has been read */ public static final String READ = "read"; diff --git a/src/com/android/mail/providers/protos/mock/MockUiProvider.java b/src/com/android/mail/providers/protos/mock/MockUiProvider.java index 275dbc8d7..c908bb8c0 100644 --- a/src/com/android/mail/providers/protos/mock/MockUiProvider.java +++ b/src/com/android/mail/providers/protos/mock/MockUiProvider.java @@ -193,7 +193,6 @@ public final class MockUiProvider extends ContentProvider { conversationMap.put(ConversationColumns.NUM_MESSAGES, 1); conversationMap.put(ConversationColumns.NUM_DRAFTS, 1); conversationMap.put(ConversationColumns.SENDING_STATE, 1); - conversationMap.put(ConversationColumns.LOADED, 1); conversationMap.put(ConversationColumns.READ, 0); conversationMap.put(ConversationColumns.SEEN, 0); conversationMap.put(ConversationColumns.STARRED, 0); @@ -233,13 +232,13 @@ public final class MockUiProvider extends ContentProvider { for (int i = 0; i < messageCount; i++) { if (i % 2 == 0) { info.addMessage(new MessageInfo(false, false, - i + "Test <testsender@test.com>", -1, "testsender@test.com", true)); + i + "Test <testsender@test.com>", -1, "testsender@test.com")); } else if (i % 3 == 0) { info.addMessage(new MessageInfo(true, false, i + "sender@test.com", -1, - "sender@test.com", true)); + "sender@test.com")); } else { info.addMessage(new MessageInfo(false, false, MessageInfo.SENDER_LIST_TOKEN_ELIDED, - -1, null, true)); + -1, null)); } } return info.toBlob(); |