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

Decrement mMessageCount when an untagged EXPUNGE is received

Browse Source
This commit is contained in:
Daniel Applebaum 2009-05-06 00:12:30 +00:00
parent 5be7ee8517
commit 27e0ec1b80
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/email/mail/store/ImapStore.java
View File

@ -752,7 +752,7 @@ public class ImapStore extends Store {
do { do {
response = mConnection.readResponse(); response = mConnection.readResponse();
handleUntaggedResponse(response); handleUntaggedResponse(response);
//Log.v(Email.LOG_TAG, "response for fetch: " + response);
if (response.mTag == null && response.get(1).equals("FETCH")) { if (response.mTag == null && response.get(1).equals("FETCH")) {
ImapList fetchList = (ImapList)response.getKeyedValue("FETCH"); ImapList fetchList = (ImapList)response.getKeyedValue("FETCH");
String uid = fetchList.getKeyedString("UID"); String uid = fetchList.getKeyedString("UID");
@ -884,10 +884,18 @@ public class ImapStore extends Store {
* @param response * @param response
*/ */
private void handleUntaggedResponse(ImapResponse response) { private void handleUntaggedResponse(ImapResponse response) {
if (response.mTag == null && response.size() > 1 && response.get(1).equals("EXISTS")) { if (response.mTag == null && response.size() > 1)
{
if (response.get(1).equals("EXISTS")) {
mMessageCount = response.getNumber(0); mMessageCount = response.getNumber(0);
//Log.i(Email.LOG_TAG, "Got untagged EXISTS with value " + mMessageCount); //Log.i(Email.LOG_TAG, "Got untagged EXISTS with value " + mMessageCount);
} }
else if (response.get(1).equals("EXPUNGE") && mMessageCount > 0) {
mMessageCount--;
// Log.i(Email.LOG_TAG, "Got untagged EXPUNGE with value " + mMessageCount);
}
}
//Log.i(Email.LOG_TAG, "mMessageCount = " + mMessageCount);
} }
private void parseBodyStructure(ImapList bs, Part part, String id) private void parseBodyStructure(ImapList bs, Part part, String id)
@ -1513,7 +1521,8 @@ public class ImapStore extends Store {
while (iter.hasNext()) while (iter.hasNext())
{ {
ImapResponse delResponse = iter.next(); ImapResponse delResponse = iter.next();
if (delResponse.mTag != null || delResponse.size() < 2 || "EXISTS".equals(delResponse.get(1)) == false) if (delResponse.mTag != null || delResponse.size() < 2
|| ("EXISTS".equals(delResponse.get(1)) == false && "EXPUNGE".equals(delResponse.get(1)) == false))
{ {
iter.remove(); iter.remove();
} }