Changeset 281

Timestamp:

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

Author:

octorian

Message:

Fix for character encoding problems (#99)

Files:

• branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/message/MessagePartFactory.java (modified) (2 diffs)

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/message/MessagePartFactory.java

@@ -33 +33 @@
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import net.rim.device.api.system.EncodedImage;
 import org.logicprobe.LogicMail.util.StringParser;
@@ -99 +100 @@
         }
         else if(encoding.equalsIgnoreCase("base64")) {
+            byte[] textBytes;
             try {
-                byte[] textBytes = UtilProxy.getInstance().Base64Decode(data);
-                data = new String(textBytes, StringParser.parseValidCharsetString(charset));
+                textBytes = UtilProxy.getInstance().Base64Decode(data);
             }
             catch (IOException exp) {
                 return createUnsupportedPart("text", mimeSubtype, data);
+            }
+            
+            try {
+                data = new String(textBytes, charset.toUpperCase());
+            }
+            catch (UnsupportedEncodingException exp) {
+                // If encoding type is bad, attempt with the default encoding
+                // so the user will at least see something.
+                data = new String(textBytes);
             }
         }