From 8ec93490fb52c4a1f18d51c460de9deb7c5eed17 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 2 Feb 2009 20:46:15 +0000
Subject: [PATCH] IMAP: send back flags on STORE command

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@312 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/imap/ImapConnection.java | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java
index bbf5cf81..2c2ecc2c 100644
--- a/src/java/davmail/imap/ImapConnection.java
+++ b/src/java/davmail/imap/ImapConnection.java
@@ -150,11 +150,10 @@ public class ImapConnection extends AbstractConnection {
                                         sendClient("* " + currentFolder.objectCount + " RECENT");
                                         sendClient("* OK [UIDVALIDITY 1]");
                                         if (messages.size() == 0) {
-                                           sendClient("* OK [UIDNEXT " + 1 + "]");
+                                            sendClient("* OK [UIDNEXT " + 1 + "]");
                                         } else {
-                                           sendClient("* OK [UIDNEXT " + (messages.get(messages.size()-1).getUidAsLong()+1) + "]"); 
+                                            sendClient("* OK [UIDNEXT " + (messages.get(messages.size() - 1).getUidAsLong() + 1) + "]");
                                         }
-                                        //sendClient("* OK [UIDNEXT " + (currentFolder.objectCount + 1) + "]");
                                         sendClient("* FLAGS (\\Answered \\Deleted \\Draft \\Flagged \\Seen $Forwarded $MDNSent Forwarded $Junk $NotJunk Junk JunkRecorded NonJunk NotJunk)");
                                         sendClient("* OK [PERMANENTFLAGS (\\Answered \\Deleted \\Draft \\Flagged \\Seen $Forwarded $MDNSent Forwarded \\*)] junk-related flags are not permanent");
                                         //sendClient("* [UNSEEN 1] first unseen message in inbox");
@@ -209,9 +208,9 @@ public class ImapConnection extends AbstractConnection {
                                                         if (messages.size() > 0) {
                                                             endIndex = messages.get(messages.size() - 1).getUidAsLong();
                                                             // fix according to spec
-                                                            if (startIndex > endIndex) {
-                                                                startIndex = endIndex;
-                                                            }
+                                                            //if (startIndex > endIndex) {
+                                                            //    startIndex = endIndex;
+                                                            //}
                                                         } else {
                                                             endIndex = 1;
                                                         }
@@ -288,6 +287,7 @@ public class ImapConnection extends AbstractConnection {
 
                                         } else if ("store".equalsIgnoreCase(subcommand)) {
                                             long uid = Long.parseLong(tokens.nextToken());
+                                            ExchangeSession.Message message = messages.getByUid(uid);
                                             String action = tokens.nextToken();
                                             String flags = tokens.nextToken();
                                             HashMap<String, String> properties = new HashMap<String, String>();
@@ -297,6 +297,7 @@ public class ImapConnection extends AbstractConnection {
                                                     String flag = flagtokenizer.nextToken();
                                                     if ("\\Seen".equals(flag)) {
                                                         properties.put("read", "0");
+                                                        message.read = false;
                                                     }
                                                 }
                                             } else if ("+Flags".equalsIgnoreCase(action)) {
@@ -305,11 +306,18 @@ public class ImapConnection extends AbstractConnection {
                                                     String flag = flagtokenizer.nextToken();
                                                     if ("\\Seen".equals(flag)) {
                                                         properties.put("read", "1");
+                                                        message.read = true;
                                                     }
                                                 }
                                             }
-                                            // TODO
                                             session.updateMessage(messages.getByUid(uid), properties);
+                                            int index = 0;
+                                            for (ExchangeSession.Message currentMessage : messages) {
+                                                index++;
+                                                if (currentMessage == message) {
+                                                    sendClient("* " + index + " FETCH (UID " + message.getUidAsLong() + " FLAGS (" + (message.read ? "\\Seen" : "") + "))");
+                                                }
+                                            }
                                             sendClient(commandId + " OK STORE completed");
                                         }
                                     } else {