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

Return Mindy's senders

Browse Source 
* Also prevent NPE

Bug: 7188573
Change-Id: Ic87e7b3411667262e2aa738a38cb2283c9340b03
This commit is contained in:
Marc Blank 2012-09-18 16:26:05 -07:00
parent b203b2b119
commit af7d768e87
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/email/imap2/Imap2SyncService.java
View File

@ -488,10 +488,9 @@ public class Imap2SyncService extends AbstractSyncService {
String envelope = p.parseList();
Parser ep = new Parser(envelope);
ep.skipWhite();
//date = parseDate(ep.parseString());
ep.parseString();
subject = ep.parseString();
parseRecipients(ep, msg);
msg.mDisplayName = parseRecipients(ep, msg);
} else if (atm.equalsIgnoreCase("FLAGS")) {
flags = p.parseList().toLowerCase();
if (flags.indexOf("\\seen") >=0)
@ -515,11 +514,7 @@ public class Imap2SyncService extends AbstractSyncService {
if (subject != null && subject.startsWith("=?"))
subject = MimeUtility.decode(subject);
msg.mSubject = subject;
//msg.bodyId = 0;
//msg.parts = parts.toString();
msg.mAccountKey = mAccountId;
msg.mFlagLoaded = Message.FLAG_LOADED_UNLOADED;
msg.mFlags = flag;
if (read)
@ -888,7 +883,7 @@ public class Imap2SyncService extends AbstractSyncService {
// If the message is updated, make sure it's not deleted (we don't want to reload it)
if (newUpdates && updatedIds.contains(msg.mServerId)) {
Message currentMsg = Message.restoreMessageWithId(mContext, msg.mId);
if (currentMsg.mMailboxKey == mTrashMailboxId) {
if (currentMsg == null || currentMsg.mMailboxKey == mTrashMailboxId) {
userLog("PHEW! Didn't save deleted message with uid: " + msg.mServerId);
continue;
}