moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 21:22:26 -05:00
Code Issues Releases Wiki Activity

Try harder not to use "special folders" as count sources

Browse Source
This commit is contained in:
Jesse Vincent 2011-01-17 04:06:34 +00:00
parent 890564b926
commit 6504d592ea
2 changed files with 330 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/com/fsck/k9/mail/store/LocalStore.java
View File

@ -586,30 +586,76 @@ public class LocalStore extends Store implements Serializable
Cursor cursor = null; Cursor cursor = null;
try try
{ {
String baseQuery = "SELECT SUM(unread_count), SUM(flagged_count) FROM folders"; String baseQuery = "SELECT SUM(unread_count), SUM(flagged_count) FROM folders WHERE ( name != ? AND name != ? AND name != ? AND name != ? AND name != ? ) ";
if (displayMode == Account.FolderMode.NONE) if (displayMode == Account.FolderMode.NONE)
{ {
cursor = db.rawQuery(baseQuery, new String[] { K9.INBOX}); cursor = db.rawQuery(baseQuery+ "AND (name = ? )", new String[]
{
mAccount.getTrashFolderName(),
mAccount.getDraftsFolderName(),
mAccount.getSpamFolderName(),
mAccount.getOutboxFolderName(),
mAccount.getSentFolderName(),
K9.INBOX
});
} }
else if (displayMode == Account.FolderMode.FIRST_CLASS ) else if (displayMode == Account.FolderMode.FIRST_CLASS )
{ {
cursor = db.rawQuery(baseQuery + " WHERE name = ? OR display_class = ?", new String[] { K9.INBOX, Folder.FolderClass.FIRST_CLASS.name()}); cursor = db.rawQuery(baseQuery + " AND ( name = ? OR display_class = ?)", new String[]
{
mAccount.getTrashFolderName(),
mAccount.getDraftsFolderName(),
mAccount.getSpamFolderName(),
mAccount.getOutboxFolderName(),
mAccount.getSentFolderName(),
K9.INBOX, Folder.FolderClass.FIRST_CLASS.name()
});
} }
else if (displayMode == Account.FolderMode.FIRST_AND_SECOND_CLASS) else if (displayMode == Account.FolderMode.FIRST_AND_SECOND_CLASS)
{ {
cursor = db.rawQuery(baseQuery + " WHERE name = ? OR display_class = ? OR display_class = ? ", new String[] { K9.INBOX, Folder.FolderClass.FIRST_CLASS.name(), Folder.FolderClass.SECOND_CLASS.name()}); cursor = db.rawQuery(baseQuery + " AND ( name = ? OR display_class = ? OR display_class = ? )", new String[]
{
mAccount.getTrashFolderName(),
mAccount.getDraftsFolderName(),
mAccount.getSpamFolderName(),
mAccount.getOutboxFolderName(),
mAccount.getSentFolderName(),
K9.INBOX, Folder.FolderClass.FIRST_CLASS.name(), Folder.FolderClass.SECOND_CLASS.name()
});
} }
else if (displayMode == Account.FolderMode.NOT_SECOND_CLASS) else if (displayMode == Account.FolderMode.NOT_SECOND_CLASS)
{ {
cursor = db.rawQuery(baseQuery + " WHERE name = ? OR display_class != ?", new String[] { K9.INBOX, Folder.FolderClass.SECOND_CLASS.name()}); cursor = db.rawQuery(baseQuery + " AND ( name = ? OR display_class != ?)", new String[]
{
mAccount.getTrashFolderName(),
mAccount.getDraftsFolderName(),
mAccount.getSpamFolderName(),
mAccount.getOutboxFolderName(),
mAccount.getSentFolderName(),
K9.INBOX, Folder.FolderClass.SECOND_CLASS.name()
});
} }
else if (displayMode == Account.FolderMode.ALL) else if (displayMode == Account.FolderMode.ALL)
{ {
cursor = db.rawQuery(baseQuery, new String[] { }); cursor = db.rawQuery(baseQuery, new String[]
{
mAccount.getTrashFolderName(),
mAccount.getDraftsFolderName(),
mAccount.getSpamFolderName(),
mAccount.getOutboxFolderName(),
mAccount.getSentFolderName()
});
} }
else else
{ {