Changeset 279

Timestamp:

08/28/08 07:07:55 PM (4 months ago)

Author:

octorian

Message:

Merge of fixes

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• mail/imap/ImapParser.java (modified) (2 diffs)
• util/StringParser.java (modified) (2 diffs)

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

@@ -283 +283 @@
         }
 
+        // 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,
                 "ImapParser.parseMessageStructure: Sanity check failed".getBytes(),
@@ -293 +308 @@
         }
 
-        Vector parsedStruct = (Vector) parsedText.elementAt(1);
         MessageSection msgStructure = parseMessageStructureHelper(null, 1,
                 parsedStruct);

trunk/LogicMail/src/org/logicprobe/LogicMail/util/StringParser.java

@@ -879 +879 @@
                 if ((index + 2) >= length) {
                     break;
-                }
-
-                try {
-                    int charVal = Integer.parseInt(text.substring(index + 1,
-                                index + 3), 16);
-                    buffer.append((char) charVal);
-                } catch (NumberFormatException exp) {
-                }
-
-                index += 3;
+                } else {
+                    char ch1 = text.charAt(index + 1);
+                    char ch2 = text.charAt(index + 2);
+
+                    if ((ch1 == '\r') && (ch2 == '\n')) {
+                        index += 3;
+                    } else if (ch1 == '\n') {
+                        index += 2;
+                    } else {
+                        try {
+                            int charVal = Integer.parseInt(text.substring(index +
+                                        1, index + 3), 16);
+                            buffer.append((char) charVal);
+                        } catch (NumberFormatException exp) {
+                        }
+
+                        index += 3;
+                    }
+                }
             } else {
                 buffer.append(text.charAt(index));
@@ -905 +914 @@
         char ch;
         String charStr;
-
-        for (int i = 0; i < text.length(); i++) {
+        int length = text.length();
+
+        for (int i = 0; i < length; i++) {
             ch = text.charAt(i);
 
-            if (ch < 128) {
+            if ((ch != '\t') && (ch != ' ') && (ch < 128)) {
+                if ((buffer.length() == 75) && (i < (length - 1))) {
+                    buffer.append("=\r\n");
+                }
+
                 buffer.append(ch);
             } else {
-                charStr = Integer.toHexString((int) ch);
+                if ((buffer.length() == 73) && (i < (length - 3))) {
+                    buffer.append("=\r\n");
+                }
+
+                charStr = Integer.toHexString((int) ch).toUpperCase();
                 buffer.append('=');