moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed issue 404: 

. Free up memory as we go in MessagingController.synchronizeMailboxSynchronous()
  . IMAP: We only do a partial fetch of the text body of large messages during background sync. This allow for faster syncs and avoid expensive parsing that lead to OutOfMemoryError
This commit is contained in:
Bao-Long Nguyen-Trong 2009-05-20 04:27:51 +00:00
parent 130e00d72a
commit 435e2c3532
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -758,6 +758,7 @@ public class MessagingController implements Runnable {
if (Config.LOGV) {
Log.v(Email.LOG_TAG, "SYNC: Got " + remoteUidMap.size() + " messages for folder " + folder);
}
remoteMessageArray = null;
/*
* Get a list of the messages that are in the remote list but not on the
@ -791,7 +792,7 @@ public class MessagingController implements Runnable {
/*
* Fetch the flags and envelope only of the new messages. This is intended to get us
s * critical data as fast as possible, and then we'll fill in the details.
* critical data as fast as possible, and then we'll fill in the details.
*/
if (unsyncedMessages.size() > 0) {
@ -926,6 +927,7 @@ s * critical data as fast as possible, and then we'll fill in the de
}
}
}
localMessages = null;
/*
* Now we download the actual content of messages.
@ -947,6 +949,7 @@ s * critical data as fast as possible, and then we'll fill in the de
+ unsyncedMessages.size() + " un synced messages "
+ " to fetch for folder " + folder);
}
unsyncedMessages.clear();
/*
@ -997,6 +1000,7 @@ s * critical data as fast as possible, and then we'll fill in the de
if (Config.LOGV) {
Log.v(Email.LOG_TAG, "SYNC: Done fetching small messages for folder " + folder);
}
smallMessages = null;
/*
* Now do the large messages that require more round trips.
@ -1077,7 +1081,7 @@ s * critical data as fast as possible, and then we'll fill in the de
// Set a flag indicating this message has been fully downloaded and can be
// viewed.
localMessage.setFlag(Flag.X_DOWNLOADED_FULL, true);
localMessage.setFlag(Flag.X_DOWNLOADED_PARTIAL, true);
}
if (isMessageSuppressed(account, folder, message) == false)
{
@ -1089,10 +1093,11 @@ s * critical data as fast as possible, and then we'll fill in the de
localFolder.getMessage(message.getUid()));
}
}
}
}//for large messsages
if (Config.LOGV) {
Log.v(Email.LOG_TAG, "SYNC: Done fetching large messages for folder " + folder);
}
largeMessages = null;
/*

3
src/com/android/email/mail/Store.java
View File

@ -23,7 +23,8 @@ public abstract class Store {
* A global suggestion to Store implementors on how much of the body
* should be returned on FetchProfile.Item.BODY_SANE requests.
*/
public static final int FETCH_BODY_SANE_SUGGESTED_SIZE = (50 * 1024);
//Matching MessagingController.MAX_SMALL_MESSAGE_SIZE
public static final int FETCH_BODY_SANE_SUGGESTED_SIZE = (5 * 1024);
protected static final int SOCKET_CONNECT_TIMEOUT = 10000;
protected static final int SOCKET_READ_TIMEOUT = 60000;

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

@ -738,7 +738,12 @@ public class ImapStore extends Store {
if (o instanceof Part) {
Part part = (Part) o;
String partId = part.getHeader(MimeHeader.HEADER_ANDROID_ATTACHMENT_STORE_DATA)[0];
fetchFields.add("BODY.PEEK[" + partId + "]");
if ("TEXT".equals(partId)) {
fetchFields.add(String.format("BODY.PEEK[TEXT]<0.%d>", FETCH_BODY_SANE_SUGGESTED_SIZE));
}
else {
fetchFields.add("BODY.PEEK[" + partId + "]");
}
}
}
@ -1457,6 +1462,7 @@ public class ImapStore extends Store {
open();
String tag = Integer.toString(mNextCommandTag++);
String commandToSend = tag + " " + command;
Log.v(Email.LOG_TAG, commandToSend);
mOut.write(commandToSend.getBytes());
mOut.write('\r');
mOut.write('\n');