Author: manolo
Date: Thu May 3 09:09:23 2012
New Revision: 1333373
URL: http://svn.apache.org/viewvc?rev=1333373&view=rev
Log:
Fix non ascii characters in CC field. Avoid storing certain contacts
Modified:
james/hupa/trunk/mock/src/main/resources/mime/10.msg
james/hupa/trunk/mock/src/main/resources/mime/6.msg
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
Modified: james/hupa/trunk/mock/src/main/resources/mime/10.msg
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/resources/mime/10.msg?rev=1333373&r1=1333372&r2=1333373&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/resources/mime/10.msg (original)
+++ james/hupa/trunk/mock/src/main/resources/mime/10.msg Thu May 3 09:09:23
2012
@@ -5,7 +5,7 @@ Date: Fri, 15 Jan 2010 12:52:56 +0100
Message-ID: <a194f7b71001150352s7c4beb02wa7c49d44d0e94...@mail.gmail.com>
Subject: Listado de temas a tratar
From: Juan Palomo <j...@palomo.com>
-To: =?ISO-8859-1?Q?No hay ma=F1ana?= <he...@hupa.org>
+To: =?ISO-8859-1?Q?No=20hay=20ma=F1ana?= <he...@hupa.org>
Content-Type: multipart/mixed; boundary=001485f7c300fc945d047d32a46a
X-Virus-Checked: Checked by ClamAV on apache.org
Modified: james/hupa/trunk/mock/src/main/resources/mime/6.msg
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/mock/src/main/resources/mime/6.msg?rev=1333373&r1=1333372&r2=1333373&view=diff
==============================================================================
--- james/hupa/trunk/mock/src/main/resources/mime/6.msg (original)
+++ james/hupa/trunk/mock/src/main/resources/mime/6.msg Thu May 3 09:09:23 2012
@@ -7,7 +7,7 @@ From: Nobody <nob...@foo.com>
Date: Tue, 8 Sep 2009 15:48:17 -0300
Subject: [gwt-contrib] Looking for Incubator sponsor for ProgressBar
To: google-web-toolkit-contributors <g...@foo.com>
-Reply-To: g...@foo.com
+Reply-To: en-usn_specialoffer-norep...@newsletter.foo.com
Sender: nob...@foo.com
Precedence: bulk
X-Google-Loop: groups
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java?rev=1333373&r1=1333372&r2=1333373&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/AbstractFetchMessagesHandler.java
Thu May 3 09:09:23 2012
@@ -180,11 +180,18 @@ public abstract class AbstractFetchMessa
// Add cc addresses
Address[] ccArray = m.getRecipients(RecipientType.CC);
ArrayList<String> cc = new ArrayList<String>();
-
if (ccArray != null) {
for (Address addr : ccArray) {
- cc.add(addr.toString());
- }
+ String mailCc = null;
+ try {
+ mailCc = MimeUtility.decodeText(addr.toString());
+ userPreferences.addContact(mailCc);
+ } catch (UnsupportedEncodingException e) {
+ logger.debug("Unable to decode mailTo " + mailCc + " "
+ e.getMessage());
+ }
+ if (mailCc != null)
+ cc.add(mailCc);
+ }
}
msg.setCc(cc);
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java?rev=1333373&r1=1333372&r2=1333373&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/handler/GetMessageDetailsHandler.java
Thu May 3 09:09:23 2012
@@ -134,6 +134,8 @@ public class GetMessageDetailsHandler ex
boolean isHTML = handleParts(message, con, sbPlain, attachmentList);
+ System.out.println(isHTML);
+
if (isHTML) {
mDetails.setText(filterHtmlDocument(sbPlain.toString(),
folderName, uid));
} else {
Modified:
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java?rev=1333373&r1=1333372&r2=1333373&view=diff
==============================================================================
---
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
(original)
+++
james/hupa/trunk/server/src/main/java/org/apache/hupa/server/preferences/UserPreferencesStorage.java
Thu May 3 09:09:23 2012
@@ -23,6 +23,7 @@ import org.apache.hupa.shared.rpc.Contac
import java.util.Arrays;
import java.util.List;
+import java.util.regex.Pattern;
/**
*
@@ -33,6 +34,8 @@ import java.util.List;
public abstract class UserPreferencesStorage {
protected static final String CONTACTS_ATTR = "contacts";
+
+ protected static final String REGEX_OMITTED_EMAILS =
"^.*(reply)[A-z0-9._%\\+\\-]*@.*$";
/**
* Add a new contact to the list.
@@ -57,8 +60,10 @@ public abstract class UserPreferencesSto
final public void addContact(List<String> mails) {
if (mails != null) {
for (String mail: mails) {
- Contact contact = new Contact(mail);
- addContact(contact);
+ if (!mail.matches(REGEX_OMITTED_EMAILS)) {
+ Contact contact = new Contact(mail);
+ addContact(contact);
+ }
}
}
}
Modified:
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java?rev=1333373&r1=1333372&r2=1333373&view=diff
==============================================================================
---
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
(original)
+++
james/hupa/trunk/server/src/test/java/org/apache/hupa/server/handler/GetMessageDetailsHandlerTest.java
Thu May 3 09:09:23 2012
@@ -146,13 +146,6 @@ public class GetMessageDetailsHandlerTes
assertTrue(details.getText().length() > 0);
}
- public void testMessageDetails_AlternativeInsideMultiparMixed() throws
Exception {
- MessageDetails details = loadMessageDetails("10.msg");
- assertEquals(1, details.getMessageAttachments().size());
- System.out.println(details.getText());
- assertTrue(details.getText().contains("<span>"));
- }
-
public void testMessageDetails_charsetIso() throws Exception {
MimeMessage message = TestUtils.loadMessageFromFile(session,"3.msg");
String from = message.getFrom()[0].toString();
@@ -168,12 +161,24 @@ public class GetMessageDetailsHandlerTes
assertTrue(details.getText().length() > 0);
}
+ public void testMessageDetails_textHtm2l() throws Exception {
+ MessageDetails details = loadMessageDetails("11.msg");
+ System.out.println(details.getText());
+ assertTrue(details.getText().length() > 0);
+ }
+
public void testMessageDetails_multiparMixed_multipartAlternative() throws
Exception {
MessageDetails details = loadMessageDetails("6.msg");
assertEquals(1, details.getMessageAttachments().size());
assertTrue(details.getText().length() > 0);
}
+ public void
testMessageDetails_multiparMixed_multipartAlternative_textAttachment() throws
Exception {
+ MessageDetails details = loadMessageDetails("10.msg");
+ assertEquals(1, details.getMessageAttachments().size());
+ assertTrue(details.getText().contains("<span>"));
+ }
+
public void testMessageDetails_html_with_inline_images() throws Exception {
IMAPStore store = storeCache.get(testUser);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
