moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 19:52:17 -05:00
Code Issues Releases Wiki Activity

further push down our "is this message for us" logic.

Browse Source
This commit is contained in:
Jesse Vincent 2009-12-27 17:20:56 +00:00
parent 6c7782b4bd
commit d60521f06f
1 changed files with 37 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/com/fsck/k9/activity/MessageList.java
View File

@ -1574,19 +1574,10 @@ public class MessageList
@Override
public void synchronizeMailboxAddOrUpdateMessage(Account account, String folder, Message message)
{
if (updateForMe(account, folder))
{
FolderInfoHolder f = mCurrentFolder;
// XXX TODO, this is the wrong folder
if (f != null)
{
addOrUpdateMessage(account, f, message);
}
}
return;
addOrUpdateMessage(account, folder, message);
}
@Override
public void synchronizeMailboxRemovedMessage(Account account, String folder,Message message)
{
@ -1644,33 +1635,13 @@ public class MessageList
@Override
public void listLocalMessagesAddMessages(Account account, String folder, List<Message> messages)
{
if (updateForMe(account, folder))
{
FolderInfoHolder f = mCurrentFolder;
// xxx "f"?
if (f != null)
{
addOrUpdateMessages(account, mCurrentFolder, messages);
}
}
addOrUpdateMessages(account, folder, messages);
}
@Override
public void listLocalMessagesUpdateMessage(Account account, String folder, Message message)
{
if (updateForMe(account, folder))
{
FolderInfoHolder f = mCurrentFolder;
// XXX TODO, this is the wrong folder
if (f != null)
{
addOrUpdateMessage(account, f, message);
}
}
addOrUpdateMessage(account, folder, message);
}
@Override
public void folderStatusChanged(Account account, String folder, int unreadMessageCount)
@ -1683,19 +1654,6 @@ public class MessageList
}
private boolean updateForMe(Account account, String folder)
{
if (mQueryString != null || (account.equals(mAccount) && mFolderName != null && folder.equals(mFolderName)))
{
return true;
}
else
{
return false;
}
}
public void pendingCommandsProcessing(Account account)
{
@ -1720,6 +1678,19 @@ public class MessageList
};
private boolean updateForMe(Account account, String folder)
{
if (mQueryString != null || (account.equals(mAccount) && mFolderName != null && folder.equals(mFolderName)))
{
return true;
}
else
{
return false;
}
}
private Drawable mAttachmentIcon;
private Drawable mAnsweredIcon;
private View footerView = null;
@ -1747,40 +1718,45 @@ public class MessageList
removeMessages(messages);
}
private void addOrUpdateMessage(Account account, FolderInfoHolder folder, Message message)
private void addOrUpdateMessage(Account account, String folder, Message message)
{
List<Message> messages = new ArrayList<Message>();
messages.add(message);
addOrUpdateMessages(account, folder, messages);
}
private void addOrUpdateMessages(Account account, FolderInfoHolder folder, List<Message> messages)
private void addOrUpdateMessages(Account account, String folder, List<Message> messages)
{
boolean needsSort = false;
List<MessageInfoHolder> messagesToAdd = new ArrayList<MessageInfoHolder>();
List<MessageInfoHolder> messagesToRemove = new ArrayList<MessageInfoHolder>();
FolderInfoHolder f = mCurrentFolder; // This is wrong, but what the old code did.
for (Message message : messages)
{
MessageInfoHolder m = getMessage(message.getUid());
if (updateForMe(account, folder))
{
MessageInfoHolder m = getMessage(message.getUid());
if (m == null)
{
m = new MessageInfoHolder(message, folder, account);
messagesToAdd.add(m);
}
else
{
if (message.isSet(Flag.DELETED))
if (m == null)
{
messagesToRemove.add(m);
m = new MessageInfoHolder(message, f, account);
messagesToAdd.add(m);
}
else
{
m.populate(message, folder, account);
needsSort = true;
if (message.isSet(Flag.DELETED))
{
messagesToRemove.add(m);
}
else
{
m.populate(message, f, account);
needsSort = true;
}
}
}
}