Changeset 270 for branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapProtocol.java

Timestamp:

08/10/08 11:02:18 AM (5 months ago)

Author:

octorian

Message:

Added workaround for servers that sometimes send untagged responses after sending a message part (fix for #95)

Files:

• branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapProtocol.java (modified) (1 diff)

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapProtocol.java

@@ -625 +625 @@
         }
         
+        // Workaround for mail servers that sometimes append untagged
+        // replies to the end of this response
+        int lastLineIndex = rawList.length - 1;
+        while(lastLineIndex > 0 && rawList[lastLineIndex].startsWith("* ")) {
+            lastLineIndex--;
+        }
+        
         StringBuffer msgBuf = new StringBuffer();
-        for(int i=1;i<rawList.length-1;i++) {
+        for(int i=1;i<lastLineIndex;i++) {
             msgBuf.append(rawList[i] + "\n");
         }
-        String lastLine = rawList[rawList.length-1];
+        String lastLine = rawList[lastLineIndex];
         msgBuf.append(lastLine.substring(0, lastLine.lastIndexOf(')')));
         return msgBuf.toString();