Changeset 278 for branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapParser.java

Timestamp:

08/26/08 08:21:20 PM (4 months ago)

Author:

octorian

Message:

Fix for errors on unexpected ordering of BODYSTRUCTURE reply. (#97)

Files:

• branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/mail/imap/ImapParser.java (modified) (2 diffs)

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

@@ -260 +260 @@
         }
 
+        // Find the BODYSTRUCTURE portion of the reply
+        Vector parsedStruct = null;
+        int size = parsedText.size();
+        for(int i=0; i<size; i++) {
+            if(parsedText.elementAt(i) instanceof String) {
+                String label = (String)parsedText.elementAt(i);
+                if(label.equalsIgnoreCase("BODYSTRUCTURE") && i < size - 1 && parsedText.elementAt(i+1) instanceof Vector) {
+                    parsedStruct = (Vector)parsedText.elementAt(i+1);
+                }
+            }
+        }
+        
         // Sanity checking
-        if(parsedText.size() < 2 ||
-           !(parsedText.elementAt(1) instanceof Vector)) {
+        if(parsedStruct == null) {
            EventLogger.logEvent(
                AppInfo.GUID,
@@ -270 +281 @@
         }
         
-        Vector parsedStruct = (Vector)parsedText.elementAt(1);
         MessageSection msgStructure = parseMessageStructureHelper(null, 1, parsedStruct);
         fixMessageStructure(msgStructure);