Changeset 262 for trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapClient.java

Timestamp:

08/02/08 05:15:29 PM (5 months ago)

Author:

octorian

Message:

UID support for messages

Files:

• trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapClient.java (modified) (9 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapClient.java

@@ -377 +377 @@
         FolderMessage[] folderMessages = new FolderMessage[response.length];
         for(int i=0;i<response.length;i++) {
-            folderMessages[i] = new FolderMessage(response[i].envelope, response[i].index);
+            folderMessages[i] = new FolderMessage(response[i].envelope, response[i].index, response[i].uid);
             folderMessages[i].setSeen(response[i].flags.seen);
             folderMessages[i].setAnswered(response[i].flags.answered);
@@ -391 +391 @@
 
     public Message getMessage(FolderMessage folderMessage) throws IOException, MailException {
-        ImapParser.MessageSection structure = getMessageStructure(folderMessage.getIndex());
+        ImapParser.MessageSection structure = getMessageStructure(folderMessage.getUid());
         MessagePart rootPart =
-            getMessagePart(folderMessage.getIndex(),
+            getMessagePart(folderMessage.getUid(),
                            structure, globalConfig.getImapMaxMsgSize());
         Message msg = new Message(folderMessage.getEnvelope(), rootPart);
@@ -399 +399 @@
     }
 
-    private MessagePart getMessagePart(int index,
+    private MessagePart getMessagePart(int uid,
                                        ImapParser.MessageSection structure,
                                        int maxSize)
@@ -411 +411 @@
             else {
                 if(structure.size < maxSize) {
-                    data = getMessageBody(index, structure.address);
+                    data = getMessageBody(uid, structure.address);
                     maxSize -= structure.size;
                 }
@@ -426 +426 @@
         if((part instanceof MultiPart)&&(structure.subsections != null)&&(structure.subsections.length > 0)) {
             for(int i=0;i<structure.subsections.length;i++) {
-                MessagePart subPart = getMessagePart(index, structure.subsections[i], maxSize);
+                MessagePart subPart = getMessagePart(uid, structure.subsections[i], maxSize);
                 if(subPart != null) {
                     ((MultiPart)part).addPart(subPart);
@@ -439 +439 @@
      * This tree is used to build the final message tree.
      */
-    private ImapParser.MessageSection getMessageStructure(int msgIndex) throws IOException, MailException {
+    private ImapParser.MessageSection getMessageStructure(int uid) throws IOException, MailException {
         if(activeMailbox.equals("")) {
             throw new MailException("Mailbox not selected");
         }
 
-        return imapProtocol.executeFetchBodystructure(msgIndex);
+        return imapProtocol.executeFetchBodystructure(uid);
     }
 
@@ -466 +466 @@
     }
 
-    private String getMessageBody(int index, String address) throws IOException, MailException {
+    private String getMessageBody(int uid, String address) throws IOException, MailException {
         if(activeMailbox.equals("")) {
             throw new MailException("Mailbox not selected");
         }
         
-        return imapProtocol.executeFetchBody(index, address);
+        return imapProtocol.executeFetchBody(uid, address);
     }
     
     public void deleteMessage(FolderMessage folderMessage) throws IOException, MailException {
         ImapProtocol.MessageFlags updatedFlags =
-            imapProtocol.executeStore(folderMessage.getIndex(), true, new String[] { "\\Deleted" });
+            imapProtocol.executeStore(folderMessage.getUid(), true, new String[] { "\\Deleted" });
         refreshMessageFlags(updatedFlags, folderMessage);
     }
@@ -483 +483 @@
     public void undeleteMessage(FolderMessage folderMessage) throws IOException, MailException {
         ImapProtocol.MessageFlags updatedFlags =
-            imapProtocol.executeStore(folderMessage.getIndex(), false, new String[] { "\\Deleted" });
+            imapProtocol.executeStore(folderMessage.getUid(), false, new String[] { "\\Deleted" });
         refreshMessageFlags(updatedFlags, folderMessage);
     }
@@ -495 +495 @@
     public void messageAnswered(FolderMessage folderMessage) throws IOException, MailException {
         ImapProtocol.MessageFlags updatedFlags =
-            imapProtocol.executeStore(folderMessage.getIndex(), true, new String[] { "\\Answered" });
+            imapProtocol.executeStore(folderMessage.getUid(), true, new String[] { "\\Answered" });
         refreshMessageFlags(updatedFlags, folderMessage);
     }