moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-02-17 07:30:16 -05:00
Code Issues Releases Wiki Activity

Invert some logic to clean up MessageList a bit

Browse Source
This commit is contained in:
Jesse Vincent 2009-12-27 16:51:00 +00:00
parent 56cdfa88c9
commit 721e298542
1 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1528,12 +1528,12 @@ public class MessageList
@Override @Override
public void synchronizeMailboxAddOrUpdateMessage(Account account, String folder, Message message) public void synchronizeMailboxAddOrUpdateMessage(Account account, String folder, Message message)
{ {
if (!account.equals(mAccount) || !folder.equals(mFolderName)) if (account.equals(mAccount) && folder.equals(mFolderName))
{ {
return; addOrUpdateMessage(folder, message);
} }
addOrUpdateMessage(folder, message); return;
} }
@Override @Override
@ -1613,35 +1613,34 @@ public class MessageList
@Override @Override
public void listLocalMessagesAddMessages(Account account, String folder, List<Message> messages) public void listLocalMessagesAddMessages(Account account, String folder, List<Message> messages)
{ {
if (!account.equals(mAccount) || !folder.equals(mFolderName)) if (account.equals(mAccount) && folder.equals(mFolderName))
{ {
return; addOrUpdateMessages(folder, messages);
} }
addOrUpdateMessages(folder, messages);
} }
@Override @Override
public void listLocalMessagesUpdateMessage(Account account, String folder, Message message) public void listLocalMessagesUpdateMessage(Account account, String folder, Message message)
{ {
if (!account.equals(mAccount) || !folder.equals(mFolderName)) if (account.equals(mAccount) && folder.equals(mFolderName))
{ {
return; addOrUpdateMessage(folder, message);
} }
addOrUpdateMessage(folder, message);
} }
@Override @Override
public void folderStatusChanged(Account account, String folderName, int unreadMessageCount) public void folderStatusChanged(Account account, String folderName, int unreadMessageCount)
{ {
if (!account.equals(mAccount) || !folderName.equals(mFolderName)) if (account.equals(mAccount) && folderName.equals(mFolderName))
{ {
return; mUnreadMessageCount = unreadMessageCount;
mHandler.refreshTitle();
} }
mUnreadMessageCount = unreadMessageCount;
mHandler.refreshTitle();
} }
public void pendingCommandsProcessing(Account account) public void pendingCommandsProcessing(Account account)
{ {
super.pendingCommandsProcessing(account); super.pendingCommandsProcessing(account);
@ -1677,12 +1676,11 @@ public class MessageList
public void removeMessages(List<MessageInfoHolder> holders) public void removeMessages(List<MessageInfoHolder> holders)
{ {
if (holders == null) if (holders != null)
{ {
return; mHandler.removeMessage(holders);
} }
mHandler.removeMessage(holders);
} }
@ -1695,14 +1693,14 @@ public class MessageList
private void addOrUpdateMessage(String folder, Message message) private void addOrUpdateMessage(String folder, Message message)
{ {
// TODO do we want "f" or "mCurrentFolder" below?
FolderInfoHolder f = mCurrentFolder; FolderInfoHolder f = mCurrentFolder;
if (f == null) if (f != null)
{ {
return; addOrUpdateMessage(f, message);
} }
addOrUpdateMessage(f, message);
} }
private void addOrUpdateMessage(FolderInfoHolder folder, Message message) private void addOrUpdateMessage(FolderInfoHolder folder, Message message)
@ -1716,13 +1714,13 @@ public class MessageList
{ {
FolderInfoHolder f = mCurrentFolder; FolderInfoHolder f = mCurrentFolder;
if (f == null) if (f != null)
{ {
return; addOrUpdateMessages(f, messages);
} }
addOrUpdateMessages(f, messages);
} }
private void addOrUpdateMessages(FolderInfoHolder folder, List<Message> messages) private void addOrUpdateMessages(FolderInfoHolder folder, List<Message> messages)
{ {
boolean needsSort = false; boolean needsSort = false;