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

simplify our "should we count messages in this folder" logic for the 

purposes of account stats generation
This commit is contained in:
Jesse Vincent 2011-01-16 21:33:43 +00:00
parent 76e1165fea
commit c5846b4202
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/com/fsck/k9/Account.java
View File

@ -654,39 +654,33 @@ public class Account implements BaseAccount
Folder.FolderClass fMode = localFolder.getDisplayClass();
// Always get stats about the INBOX (see issue 1817)
if (folder.getName().equals(K9.INBOX) || (
!folder.getName().equals(getTrashFolderName()) &&
!folder.getName().equals(getDraftsFolderName()) &&
!folder.getName().equals(getArchiveFolderName()) &&
!folder.getName().equals(getSpamFolderName()) &&
!folder.getName().equals(getOutboxFolderName()) &&
!folder.getName().equals(getSentFolderName()) &&
!folder.getName().equals(getErrorFolderName())))
if (!folder.getName().equals(K9.INBOX) && isSpecialFolder(folder.getName()) )
{
if (aMode == Account.FolderMode.NONE)
{
continue;
}
if (aMode == Account.FolderMode.FIRST_CLASS &&
fMode != Folder.FolderClass.FIRST_CLASS)
{
continue;
}
if (aMode == Account.FolderMode.FIRST_AND_SECOND_CLASS &&
fMode != Folder.FolderClass.FIRST_CLASS &&
fMode != Folder.FolderClass.SECOND_CLASS)
{
continue;
}
if (aMode == Account.FolderMode.NOT_SECOND_CLASS &&
fMode == Folder.FolderClass.SECOND_CLASS)
{
continue;
}
unreadMessageCount += folder.getUnreadMessageCount();
flaggedMessageCount += folder.getFlaggedMessageCount();
continue;
}
if (aMode == Account.FolderMode.NONE)
{
continue;
}
if (aMode == Account.FolderMode.FIRST_CLASS &&
fMode != Folder.FolderClass.FIRST_CLASS)
{
continue;
}
if (aMode == Account.FolderMode.FIRST_AND_SECOND_CLASS &&
fMode != Folder.FolderClass.FIRST_CLASS &&
fMode != Folder.FolderClass.SECOND_CLASS)
{
continue;
}
if (aMode == Account.FolderMode.NOT_SECOND_CLASS &&
fMode == Folder.FolderClass.SECOND_CLASS)
{
continue;
}
unreadMessageCount += folder.getUnreadMessageCount();
flaggedMessageCount += folder.getFlaggedMessageCount();
}
long folderEvalEnd = System.currentTimeMillis();
stats.unreadMessageCount = unreadMessageCount;