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

Merge "Simplify MessageRetrievalListener."

This commit is contained in:
Makoto Onuki 2010-05-14 10:45:43 -07:00 committed by Android (Google) Code Review
parent feec136ee2 dbbd2ba22c
commit 6bdd7998c3
6 changed files with 45 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/android/email/MessagingController.java
View File

@ -20,13 +20,13 @@ import com.android.email.mail.FetchProfile;
import com.android.email.mail.Flag;
import com.android.email.mail.Folder;
import com.android.email.mail.Message;
import com.android.email.mail.MessageRetrievalListener;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Part;
import com.android.email.mail.Sender;
import com.android.email.mail.Store;
import com.android.email.mail.StoreSynchronizer;
import com.android.email.mail.Folder.FolderType;
import com.android.email.mail.Folder.MessageRetrievalListener;
import com.android.email.mail.Folder.OpenMode;
import com.android.email.mail.internet.MimeBodyPart;
import com.android.email.mail.internet.MimeHeader;
@ -303,7 +303,7 @@ public class MessagingController implements Runnable {
AttachmentProvider.deleteAllMailboxAttachmentFiles(
mContext, accountId, localInfo.mId);
// Delete the mailbox. Triggers will take care of
// related Message, Body and Attachment records.
// related Message, Body and Attachment records.
Uri uri = ContentUris.withAppendedId(
EmailContent.Mailbox.CONTENT_URI, localInfo.mId);
mContext.getContentResolver().delete(uri, null, null);
@ -601,7 +601,7 @@ public class MessagingController implements Runnable {
remoteFolder.fetch(unsyncedMessages.toArray(new Message[0]), fp,
new MessageRetrievalListener() {
public void messageFinished(Message message, int number, int ofTotal) {
public void messageRetrieved(Message message) {
try {
// Determine if the new message was already known (e.g. partial)
// And create or reload the full message info
@ -638,9 +638,6 @@ public class MessagingController implements Runnable {
"Error while storing downloaded message." + e.toString());
}
}
public void messageStarted(String uid, int number, int ofTotal) {
}
});
}
@ -768,14 +765,11 @@ public class MessagingController implements Runnable {
fp.add(FetchProfile.Item.BODY);
remoteFolder.fetch(smallMessages.toArray(new Message[smallMessages.size()]), fp,
new MessageRetrievalListener() {
public void messageFinished(Message message, int number, int ofTotal) {
public void messageRetrieved(Message message) {
// Store the updated message locally and mark it fully loaded
copyOneMessageToProvider(message, account, folder,
EmailContent.Message.FLAG_LOADED_COMPLETE);
}
public void messageStarted(String uid, int number, int ofTotal) {
}
});
// 14. Download large messages. We ask the server to give us the message structure,
@ -1363,7 +1357,7 @@ public class MessagingController implements Runnable {
*/
private void processPendingFlagChange(Store remoteStore, Mailbox mailbox, boolean changeRead,
boolean changeFlagged, EmailContent.Message newMessage) throws MessagingException {
// 0. No remote update if the message is local-only
if (newMessage.mServerId == null || newMessage.mServerId.equals("")
|| newMessage.mServerId.startsWith(LOCAL_SERVERID_PREFIX)) {

10
src/com/android/email/mail/Folder.java
View File

@ -40,6 +40,16 @@ public abstract class Folder {
UNKNOWN // the role of this folder is unknown
}
/**
* Callback for each message retrieval.
*
* Not all {@link Folder} implementation won't call it.
* (Currently {@link com.android.email.mail.store.LocalStore.LocalFolder} won't.)
*/
public interface MessageRetrievalListener {
public void messageRetrieved(Message message);
}
/**
* Forces an open of the MailProvider. If the provider is already open this
* function returns without doing anything.

23
src/com/android/email/mail/MessageRetrievalListener.java
View File

@ -1,23 +0,0 @@
/*
* Copyright (C) 2008 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.email.mail;
public interface MessageRetrievalListener {
public void messageStarted(String uid, int number, int ofTotal);
public void messageFinished(Message message, int number, int ofTotal);
}

17
src/com/android/email/mail/store/ImapStore.java
View File

@ -26,7 +26,6 @@ import com.android.email.mail.FetchProfile;
import com.android.email.mail.Flag;
import com.android.email.mail.Folder;
import com.android.email.mail.Message;
import com.android.email.mail.MessageRetrievalListener;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Part;
import com.android.email.mail.Store;
@ -748,13 +747,10 @@ public class ImapStore extends Store {
}
}
for (int i = 0, count = uids.size(); i < count; i++) {
if (listener != null) {
listener.messageStarted(uids.get(i), i, count);
}
ImapMessage message = new ImapMessage(uids.get(i), this);
messages.add(message);
if (listener != null) {
listener.messageFinished(message, i, count);
listener.messageRetrieved(message);
}
}
} catch (IOException ioe) {
@ -788,13 +784,10 @@ public class ImapStore extends Store {
uids = tempUids.toArray(new String[] {});
}
for (int i = 0, count = uids.length; i < count; i++) {
if (listener != null) {
listener.messageStarted(uids[i], i, count);
}
ImapMessage message = new ImapMessage(uids[i], this);
messages.add(message);
if (listener != null) {
listener.messageFinished(message, i, count);
listener.messageRetrieved(message);
}
}
} catch (IOException ioe) {
@ -883,10 +876,6 @@ public class ImapStore extends Store {
Message message = messageMap.get(uid);
if (message == null) continue;
if (listener != null) {
listener.messageStarted(uid, messageNumber++, messageMap.size());
}
if (fp.contains(FetchProfile.Item.FLAGS)) {
ImapList flags = fetchList.getKeyedList("FLAGS");
ImapMessage imapMessage = (ImapMessage) message;
@ -960,7 +949,7 @@ public class ImapStore extends Store {
}
if (listener != null) {
listener.messageFinished(message, messageNumber, messageMap.size());
listener.messageRetrieved(message);
}
}

1
src/com/android/email/mail/store/LocalStore.java
View File

@ -25,7 +25,6 @@ import com.android.email.mail.Flag;
import com.android.email.mail.Folder;
import com.android.email.mail.Message;
import com.android.email.mail.Message.RecipientType;
import com.android.email.mail.MessageRetrievalListener;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Part;
import com.android.email.mail.Store;

70
src/com/android/email/mail/store/Pop3Store.java
View File

@ -23,7 +23,6 @@ import com.android.email.mail.FetchProfile;
import com.android.email.mail.Flag;
import com.android.email.mail.Folder;
import com.android.email.mail.Message;
import com.android.email.mail.MessageRetrievalListener;
import com.android.email.mail.MessagingException;
import com.android.email.mail.Store;
import com.android.email.mail.Transport;
@ -49,7 +48,7 @@ public class Pop3Store extends Store {
// when code is checked in or released.
private static boolean DEBUG_FORCE_SINGLE_LINE_UIDL = false;
private static boolean DEBUG_LOG_RAW_STREAM = false;
private static final Flag[] PERMANENT_FLAGS = { Flag.DELETED };
private Transport mTransport;
@ -135,7 +134,7 @@ public class Pop3Store extends Store {
}
}
}
/**
* For testing only. Injects a different transport. The transport should already be set
* up and ready to use. Do not use for real code.
@ -166,7 +165,7 @@ public class Pop3Store extends Store {
* Used by account setup to test if an account's settings are appropriate. The definition
* of "checked" here is simply, can you log into the account and does it meet some minimum set
* of feature requirements?
*
*
* @throws MessagingException if there was some problem with the account
*/
@Override
@ -197,12 +196,12 @@ public class Pop3Store extends Store {
mName = name;
}
}
/**
* Used by account setup to test if an account's settings are appropriate. Here, we run
* an additional test to see if UIDL is supported on the server. If it's not we
* can't service this account.
*
*
* @throws MessagingException if the account is not going to be useable
*/
public void checkSettings() throws MessagingException {
@ -305,10 +304,10 @@ public class Pop3Store extends Store {
}
/**
* Close the folder (and the transport below it).
*
* Close the folder (and the transport below it).
*
* MUST NOT return any exceptions.
*
*
* @param expunge If true all deleted messages will be expunged (TODO - not implemented)
*/
@Override
@ -387,15 +386,11 @@ public class Pop3Store extends Store {
throw new MessagingException("getMessages", ioe);
}
ArrayList<Message> messages = new ArrayList<Message>();
int i = 0;
for (int msgNum = start; msgNum <= end; msgNum++) {
Pop3Message message = mMsgNumToMsgMap.get(msgNum);
if (listener != null) {
listener.messageStarted(message.getUid(), i++, (end - start) + 1);
}
messages.add(message);
if (listener != null) {
listener.messageFinished(message, i++, (end - start) + 1);
listener.messageRetrieved(message);
}
}
return messages.toArray(new Message[messages.size()]);
@ -494,13 +489,13 @@ public class Pop3Store extends Store {
/**
* Simple parser class for UIDL messages.
*
* <p>NOTE: In variance with RFC 1939, we allow multiple whitespace between the
* message-number and unique-id fields. This provides greater compatibility with some
*
* <p>NOTE: In variance with RFC 1939, we allow multiple whitespace between the
* message-number and unique-id fields. This provides greater compatibility with some
* non-compliant POP3 servers, e.g. mail.comcast.net.
*/
/* package */ class UidlParser {
/**
* Caller can read back message-number from this field
*/
@ -517,19 +512,19 @@ public class Pop3Store extends Store {
* True if an error was reported
*/
public boolean mErr;
/**
* Construct & Initialize
*/
public UidlParser() {
mErr = true;
}
/**
* Parse a single-line response. This is returned from a command of the form
* "UIDL msg-num" and will be formatted as: "+OK msg-num unique-id" or
* "UIDL msg-num" and will be formatted as: "+OK msg-num unique-id" or
* "-ERR diagnostic text"
*
*
* @param response The string returned from the server
* @return true if the string parsed as expected (e.g. no syntax problems)
*/
@ -557,11 +552,11 @@ public class Pop3Store extends Store {
}
return false;
}
/**
* Parse a multi-line response. This is returned from a command of the form
* "UIDL" and will be formatted as: "." or "msg-num unique-id".
*
*
* @param response The string returned from the server
* @return true if the string parsed as expected (e.g. no syntax problems)
*/
@ -646,9 +641,6 @@ public class Pop3Store extends Store {
}
Pop3Message pop3Message = (Pop3Message)message;
try {
if (listener != null) {
listener.messageStarted(pop3Message.getUid(), i, count);
}
if (fp.contains(FetchProfile.Item.BODY)) {
fetchBody(pop3Message, -1);
}
@ -668,7 +660,7 @@ public class Pop3Store extends Store {
pop3Message.setBody(null);
}
if (listener != null) {
listener.messageFinished(message, i, count);
listener.messageRetrieved(message);
}
} catch (IOException ioe) {
mTransport.close();
@ -702,9 +694,6 @@ public class Pop3Store extends Store {
throw new MessagingException("Pop3Store.fetch called with non-Pop3 Message");
}
Pop3Message pop3Message = (Pop3Message)message;
if (listener != null) {
listener.messageStarted(pop3Message.getUid(), i, count);
}
String response = executeSimpleCommand(String.format("LIST %d",
mUidToMsgNumMap.get(pop3Message.getUid())));
try {
@ -716,7 +705,7 @@ public class Pop3Store extends Store {
throw new IOException();
}
if (listener != null) {
listener.messageFinished(pop3Message, i, count);
listener.messageRetrieved(pop3Message);
}
}
} else {
@ -724,7 +713,6 @@ public class Pop3Store extends Store {
for (Message message : messages) {
msgUidIndex.add(message.getUid());
}
int i = 0, count = messages.length;
String response = executeSimpleCommand("LIST");
while ((response = mTransport.readLine()) != null) {
if (response.equals(".")) {
@ -741,14 +729,10 @@ public class Pop3Store extends Store {
throw new IOException();
}
if (pop3Message != null && msgUidIndex.contains(pop3Message.getUid())) {
if (listener != null) {
listener.messageStarted(pop3Message.getUid(), i, count);
}
pop3Message.setSize(msgSize);
if (listener != null) {
listener.messageFinished(pop3Message, i, count);
listener.messageRetrieved(pop3Message);
}
i++;
}
}
}
@ -897,18 +881,18 @@ public class Pop3Store extends Store {
/**
* Send a single command and wait for a single line response. Reopens the connection,
* if it is closed. Leaves the connection open.
*
*
* @param command The command string to send to the server.
* @return Returns the response string from the server.
*/
private String executeSimpleCommand(String command) throws IOException, MessagingException {
return executeSensitiveCommand(command, null);
}
/**
* Send a single command and wait for a single line response. Reopens the connection,
* if it is closed. Leaves the connection open.
*
*
* @param command The command string to send to the server.
* @param sensitiveReplacement If the command includes sensitive data (e.g. authentication)
* please pass a replacement string here (for logging).
@ -974,9 +958,9 @@ public class Pop3Store extends Store {
}
}
/**
/**
* POP3 Capabilities as defined in RFC 2449. This is not a complete list of CAPA
* responses - just those that we use in this client.
* responses - just those that we use in this client.
*/
class Pop3Capabilities {
/** The STLS (start TLS) command is supported */