mirror of https://github.com/moparisthebest/k-9
Manual merge of r1141 as I was unable to do a svn merge (may be because of the package renaming):
More fix for issue 810: Delete intents are not also broadcasted when we delete a message because it was deleted on the server
This commit is contained in:
parent
a2540121fa
commit
95dca851e4
|
@ -1507,14 +1507,23 @@ public class MessagingController implements Runnable
|
||||||
{
|
{
|
||||||
Message localMessage = localFolder.getMessage(remoteMessage.getUid());
|
Message localMessage = localFolder.getMessage(remoteMessage.getUid());
|
||||||
boolean messageChanged = syncFlags(localMessage, remoteMessage);
|
boolean messageChanged = syncFlags(localMessage, remoteMessage);
|
||||||
|
if (messageChanged)
|
||||||
if (messageChanged && isMessageSuppressed(account, folder, localMessage) == false)
|
{
|
||||||
|
if (isMessageSuppressed(account, folder, localMessage) == false)
|
||||||
{
|
{
|
||||||
for (MessagingListener l : getListeners())
|
for (MessagingListener l : getListeners())
|
||||||
{
|
{
|
||||||
l.synchronizeMailboxAddOrUpdateMessage(account, folder, localMessage);
|
l.synchronizeMailboxAddOrUpdateMessage(account, folder, localMessage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (localMessage.isSet(Flag.DELETED))
|
||||||
|
{
|
||||||
|
for (MessagingListener l : getListeners())
|
||||||
|
{
|
||||||
|
l.synchronizeMailboxRemovedMessage(account, folder, localMessage);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Log.i(Email.LOG_TAG, "SYNC: Synced remote messages for folder " + folder + ", " + newMessages.get() + " new messages");
|
Log.i(Email.LOG_TAG, "SYNC: Synced remote messages for folder " + folder + ", " + newMessages.get() + " new messages");
|
||||||
|
|
Loading…
Reference in New Issue