From b9213876f6a233baca501d3502c3ed868c32a2e6 Mon Sep 17 00:00:00 2001
From: Marc Blank <mblank@google.com>
Date: Thu, 17 Sep 2009 14:19:44 -0700
Subject: [PATCH] Fix issue with older messages not getting deleted properly
 from device

Change-Id: I3c3a7b6c7c6983cad47826543f9ac4291c6b2a69
---
 src/com/android/exchange/adapter/EmailSyncAdapter.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/android/exchange/adapter/EmailSyncAdapter.java b/src/com/android/exchange/adapter/EmailSyncAdapter.java
index e715a975d..71eb7a76c 100644
--- a/src/com/android/exchange/adapter/EmailSyncAdapter.java
+++ b/src/com/android/exchange/adapter/EmailSyncAdapter.java
@@ -316,8 +316,8 @@ public class EmailSyncAdapter extends AbstractSyncAdapter {
                     WHERE_SERVER_ID_AND_MAILBOX_KEY, bindArguments, null);
         }
 
-        private void deleteParser(ArrayList<Long> deletes) throws IOException {
-            while (nextTag(Tags.SYNC_DELETE) != END) {
+        private void deleteParser(ArrayList<Long> deletes, int entryTag) throws IOException {
+            while (nextTag(entryTag) != END) {
                 switch (tag) {
                     case Tags.SYNC_SERVER_ID:
                         String serverId = getValue();
@@ -400,8 +400,8 @@ public class EmailSyncAdapter extends AbstractSyncAdapter {
                 if (tag == Tags.SYNC_ADD) {
                     addParser(newEmails);
                     incrementChangeCount();
-                } else if (tag == Tags.SYNC_DELETE) {
-                    deleteParser(deletedEmails);
+                } else if (tag == Tags.SYNC_DELETE || tag == Tags.SYNC_SOFT_DELETE) {
+                    deleteParser(deletedEmails, tag);
                     incrementChangeCount();
                 } else if (tag == Tags.SYNC_CHANGE) {
                     changeParser(changedEmails);