moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-26 01:28:50 -05:00
Code Issues Releases Wiki Activity

extract our our folder-count updating code from the flag setting code

Browse Source
This commit is contained in:
Jesse Vincent 2010-11-12 21:38:11 +00:00
parent eb908b67a3
commit b2e5d7afc5
1 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4867,63 +4867,13 @@ public class LocalStore extends Store implements Serializable
@Override @Override
public void setFlag(Flag flag, boolean set) throws MessagingException public void setFlag(Flag flag, boolean set) throws MessagingException
{ {
/*
* If a message is being marked as deleted we want to clear out it's content
* and attachments as well. Delete will not actually remove the row since we need
* to retain the uid for synchronization purposes.
*/
if (flag == Flag.DELETED && set) if (flag == Flag.DELETED && set)
{ {
delete(); delete();
} }
else if (flag == Flag.X_DESTROYED && set)
{
}
/* updateFolderCountsOnFlag(flag, set);
* Update the unread count on the folder.
*/
try
{
LocalFolder folder = (LocalFolder)mFolder;
if (flag == Flag.DELETED || flag == Flag.X_DESTROYED)
{
if (set != isSet(Flag.SEEN))
{
folder.setUnreadMessageCount(folder.getUnreadMessageCount() + ( set ? 1: -1) );
}
if (isSet(Flag.FLAGGED))
{
folder.setFlaggedMessageCount(folder.getFlaggedMessageCount() + (set ? -1 : 1));
}
}
if ( flag == Flag.SEEN && !isSet(Flag.DELETED))
{
if (set != isSet(Flag.SEEN))
{
folder.setUnreadMessageCount(folder.getUnreadMessageCount() + ( set ? 1: -1) );
}
}
if (flag == Flag.FLAGGED && !isSet(Flag.DELETED))
{
folder.setFlaggedMessageCount(folder.getFlaggedMessageCount() + (set ? 1 : -1));
}
}
catch (MessagingException me)
{
Log.e(K9.LOG_TAG, "Unable to update LocalStore unread message count",
me);
throw new RuntimeException(me);
}
if (flag == Flag.X_DESTROYED && set)
{
return;
}
super.setFlag(flag, set); super.setFlag(flag, set);
@ -4938,6 +4888,11 @@ public class LocalStore extends Store implements Serializable
} }
/*
* If a message is being marked as deleted we want to clear out it's content
* and attachments as well. Delete will not actually remove the row since we need
* to retain the uid for synchronization purposes.
*/
private void delete() throws MessagingException private void delete() throws MessagingException
{ {
@ -4989,9 +4944,50 @@ public class LocalStore extends Store implements Serializable
{ {
((LocalFolder) mFolder).deleteAttachments(mId); ((LocalFolder) mFolder).deleteAttachments(mId);
mDb.execSQL("DELETE FROM messages WHERE id = ?", new Object[] { mId }); mDb.execSQL("DELETE FROM messages WHERE id = ?", new Object[] { mId });
setFlag(Flag.X_DESTROYED, true); updateFolderCountsOnFlag(Flag.X_DESTROYED, true);
} }
private void updateFolderCountsOnFlag(Flag flag, boolean set) throws MessagingException
{
/*
* Update the unread count on the folder.
*/
try
{
LocalFolder folder = (LocalFolder)mFolder;
if (flag == Flag.DELETED || flag == Flag.X_DESTROYED)
{
if (set != isSet(Flag.SEEN))
{
folder.setUnreadMessageCount(folder.getUnreadMessageCount() + ( set ? 1: -1) );
}
if (isSet(Flag.FLAGGED))
{
folder.setFlaggedMessageCount(folder.getFlaggedMessageCount() + (set ? -1 : 1));
}
}
if ( flag == Flag.SEEN && !isSet(Flag.DELETED))
{
if (set != isSet(Flag.SEEN))
{
folder.setUnreadMessageCount(folder.getUnreadMessageCount() + ( set ? 1: -1) );
}
}
if (flag == Flag.FLAGGED && !isSet(Flag.DELETED))
{
folder.setFlaggedMessageCount(folder.getFlaggedMessageCount() + (set ? 1 : -1));
}
}
catch (MessagingException me)
{
Log.e(K9.LOG_TAG, "Unable to update LocalStore unread message count",
me);
throw new RuntimeException(me);
}
}
private void loadHeaders() private void loadHeaders()
{ {