almost there

[org.ibex.mail.git] / src / org / ibex / mail / Message.java

diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index 690285c..2aa9331 100644 (file)
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -11,6 +11,8 @@ import java.io.*;
 // folded headers: can insert CRLF anywhere that whitespace appears (before the whitespace)
 // date/time parsing: see spec, 3.3
 
+// FIXME: messages must NEVER contain 8-bit binary data; this is a violation of IMAP
+
 // FEATURE: PGP-signature-parsing
 // FEATURE: mailing list header parsing
 // FEATURE: delivery status notification (and the sneaky variety)
@@ -41,16 +43,16 @@ public class Message extends JSReflection {
     public final Trace[] traces;
 
     public final Address envelopeFrom;
-    public final Address[] envelopeTo;
+    public final Address envelopeTo;
 
     public final Date arrival;         // when the message first arrived at this machine; IMAP "internal date message attr"
     
-    // FIXME: need to be able to read back in the EnvelopeFrom / EnvelopeTo fields
     public void dump(OutputStream os) throws IOException {
         Writer w = new OutputStreamWriter(os);
+        w.write("X-org.ibex.mail-envelopeFrom: " + envelopeFrom + "\r\n");
+        w.write("X-org.ibex.mail-envelopeTo: " + envelopeTo + "\r\n");
         w.write(allHeaders);
-        w.write("X-IbexMail-EnvelopeFrom: " + envelopeFrom + "\r\n");
-        w.write("X-IbexMail-EnvelopeTo: "); for(int i=0; i<envelopeTo.length; i++) w.write(envelopeTo[i] + " "); w.write("\r\n");
+        w.write("\r\n");
         w.write(body);
         w.flush();
     }
@@ -94,9 +96,13 @@ public class Message extends JSReflection {
     }
 
     public static class Malformed extends MailException.Malformed { public Malformed(String s) { super(s); } }
-    public Message(Address envelopeFrom, Address[] envelopeTo, LineReader rs) {
+
+    public Message(Address envelopeFrom, Address envelopeTo, String s, Date arrival)
+        { this(envelopeFrom, envelopeTo, new LineReader(new StringReader(s)), arrival); }
+    public Message(Address envelopeFrom, Address envelopeTo, LineReader rs) { this(envelopeFrom, envelopeTo, rs, null); }
+    public Message(Address envelopeFrom, Address envelopeTo, LineReader rs, Date arrival) {
         try {
-            this.arrival = new Date();
+            this.arrival = arrival == null ? new Date() : arrival;
             this.headers = new CaseInsensitiveHash();
             Vec envelopeToHeader = new Vec();
             String key = null;
@@ -119,7 +125,7 @@ public class Message extends JSReflection {
                     if (key.charAt(i) < 33 || key.charAt(i) > 126)
                         throw new Malformed("Header key \""+key+"\" contains invalid character \"" + key.charAt(i) + "\"");
                 String val = s.substring(s.indexOf(':') + 1).trim();
-                while(Character.isSpace(val.charAt(0))) val = val.substring(1);
+                while(val.length() > 0 && Character.isSpace(val.charAt(0))) val = val.substring(1);
                 if (key.startsWith("Resent-")) {
                     if (key.startsWith("Resent-From")) resent.addElement(new Hashtable());
                     ((Hashtable)resent.lastElement()).put(key.substring(7), val);
@@ -128,21 +134,19 @@ public class Message extends JSReflection {
                 } else if (key.equals("X-org.ibex.mail.headers.envelopeFrom")) {
                     if (envelopeFrom == null) envelopeFrom = new Address(val);
                 } else if (key.equals("X-org.ibex.mail.headers.envelopeTo")) {
-                    if (envelopeTo == null) envelopeToHeader.addElement(new Address(val));
+                    if (envelopeTo == null) envelopeTo = new Address(val);
                 } else {
                     // just append it to the previous one; valid for Comments/Keywords
                     if (headers.get(key) != null) val = headers.get(key) + " " + val;
                     ((CaseInsensitiveHash)headers).add(key, val);
                 }            
             }
-            if (envelopeTo == null) envelopeTo = new Address[envelopeToHeader.size()];
-            envelopeToHeader.copyInto(envelopeTo);
 
             // FIXME what if all are null?
-            this.to           = headers.get("To") == null   ? envelopeTo[0] : new Address((String)headers.get("To"));
+            this.to           = headers.get("To") == null   ? envelopeTo    : new Address((String)headers.get("To"));
             this.from         = headers.get("From") == null ? envelopeFrom  : new Address((String)headers.get("From"));
-            this.envelopeFrom = envelopeFrom == null        ? this.from                 : envelopeFrom;
-            this.envelopeTo   = envelopeTo == null          ? new Address[] { this.to } : envelopeTo;
+            this.envelopeFrom = envelopeFrom == null        ? this.from     : envelopeFrom;
+            this.envelopeTo   = envelopeTo == null          ? this.to       : envelopeTo;
 
             this.date      = new Date(); // FIXME (Date)headers.get("Date");
             this.replyto   = headers.get("Reply-To") == null ? null : new Address((String)headers.get("Reply-To"));
@@ -187,6 +191,7 @@ public class Message extends JSReflection {
         return ret.toString();
     }
 
+    public String rfc822() { return allHeaders + "\r\n" + body; }
     public int rfc822size() { return allHeaders.length() + 2 /* CRLF */ + body.length(); }  // FIXME: double check this
 
     public String summary() {