Changeset 274

Timestamp:

08/19/08 07:51:07 PM (3 months ago)

Author:

octorian

Message:

Fixes for #96

Location:

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail

Files:

• mail/imap/ImapParser.java (modified) (1 diff)
• ui/CompositionScreen.java (modified) (1 diff)
• util/StringParser.java (modified) (4 diffs)

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

@@ -213 +213 @@
                     hostName = (String)entry.elementAt(3);
                 }
+                
+                String addrStr =
+                        (mbName.equals(strNIL) ? "" : mbName) +
+                        (hostName.equals(strNIL) ? "" : ('@' + hostName));
                 // Now assemble these into a single address entry
                 // (possibly eventually storing them separately)
                 if(realName.length() > 0 && !realName.equals(strNIL)) {
-                    addrList[index] = realName + " <" + mbName + "@" + hostName + ">";
+                    addrList[index] = realName + " <" + addrStr + ">";
                 }
                 else {
-                    addrList[index] = mbName + "@" + hostName;
+                    addrList[index] = addrStr;
                 }
                 index++;

branches/LogicMail-1.0/LogicMail/src/org/logicprobe/LogicMail/ui/CompositionScreen.java

@@ -128 +128 @@
         if(env.to != null) {
             for(i=0; i<env.to.length; i++) {
-                insertRecipientField(EmailAddressBookEditField.ADDRESS_TO).setAddress(env.to[i]);
+                if(env.to[i].indexOf('@') != -1) {
+                    insertRecipientField(EmailAddressBookEditField.ADDRESS_TO).setAddress(env.to[i]);
+                }
             }
         }
         if(env.cc != null) {
             for(i=0; i<env.cc.length; i++) {
-                insertRecipientField(EmailAddressBookEditField.ADDRESS_CC).setAddress(env.cc[i]);
+                if(env.cc[i].indexOf('@') != -1) {
+                    insertRecipientField(EmailAddressBookEditField.ADDRESS_CC).setAddress(env.cc[i]);
+                }
             }
         }
         if(env.bcc != null) {
             for(i=0; i<env.bcc.length; i++) {
-                insertRecipientField(EmailAddressBookEditField.ADDRESS_BCC).setAddress(env.bcc[i]);
+                if(env.bcc[i].indexOf('@') != -1) {
+                    insertRecipientField(EmailAddressBookEditField.ADDRESS_BCC).setAddress(env.bcc[i]);
+                }
             }
         }

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

@@ -334 +334 @@
         return buf.toString();
     }
-    
+
     /**
      * Recursively parse a nested paren string.
@@ -359 +359 @@
         boolean inQuote = false;
         while(q < rawText.length()) {
-            if(rawText.charAt(q) == '\"') {
+            if(isQuoteChar(rawText, q, p)) {
                 if(!inQuote) {
                     inQuote = true;
@@ -422 +422 @@
                         }
                     }
-                    if(rawText.charAt(i) == '\"' && !subInQuote) {
+
+                    if(isQuoteChar(rawText, i, q+1) && !subInQuote) {
                         subInQuote = true;
                     }
-                    else if(rawText.charAt(i) == '\"' && subInQuote) {
+                    else if(isQuoteChar(rawText, i, q+1) && subInQuote) {
                         subInQuote = false;
                     }
@@ -454 +455 @@
         }
         return parsedText;
+    }
+
+    /**
+     * Helper method to determine if a character is a quote.
+     */
+    private static boolean isQuoteChar(String rawText, int index, int startIndex)
+    {
+        if(index == startIndex) {
+            return rawText.charAt(index) == '\"';
+        }
+        else if(rawText.charAt(index) == '\"') {
+            if(rawText.charAt(index - 1) == '\\') {
+                if(index - 2 < startIndex || rawText.charAt(index - 2) == '\\') {
+                    return true;
+                }
+                else {
+                    return false;
+                }
+            }
+            else {
+                return true;
+            }
+        }
+        else {
+            return false;
+        }
     }