Changeset 277 for branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/util/StringParser.java

Timestamp:

08/26/08 08:06:55 PM (4 months ago)

Author:

octorian

Message:

Fix for quoted-printable decoding errors (#98)

Files:

• branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/util/StringParser.java (modified) (3 diffs)

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/util/StringParser.java

@@ -732 +732 @@
                     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 {
@@ -753 +765 @@
         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('=');
                 if(charStr.length() == 1) {
@@ -767 +786 @@
             }
         }
+        
         return buffer.toString();
     }