From 2eaa99bb3a13002ecef92e34357ab799ff4cb6b8 Mon Sep 17 00:00:00 2001 From: Daniel Applebaum Date: Wed, 7 Jan 2009 06:36:46 +0000 Subject: [PATCH] Do not delete remote messages during sync. Trust the delete routines to send the proper delete requests (delete, mark read, nothing). Otherwise, this code will delete on the server any message deleted on the handset, no matter option the user selects. --- src/com/android/email/MessagingController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/com/android/email/MessagingController.java b/src/com/android/email/MessagingController.java index 1dc8f441b..2898c2d0e 100644 --- a/src/com/android/email/MessagingController.java +++ b/src/com/android/email/MessagingController.java @@ -632,14 +632,14 @@ public class MessagingController implements Runnable { /* * Trash any remote messages that are marked as trashed locally. */ - for (Message message : localMessages) { - Message remoteMessage = remoteUidMap.get(message.getUid()); - // skip things deleted on the server side - if (remoteMessage != null && message.isSet(Flag.DELETED)) { - remoteMessage.setFlag(Flag.DELETED, true); - } - - } +// for (Message message : localMessages) { +// Message remoteMessage = remoteUidMap.get(message.getUid()); +// // skip things deleted on the server side +// if (remoteMessage != null && message.isSet(Flag.DELETED)) { +// remoteMessage.setFlag(Flag.DELETED, true); +// } +// +// } /*