marek/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* SusiMail:

Browse Source 
- Subject sort enhancements
   - Tag Re: and Fwd:
This commit is contained in:
zzz
2014-04-25 20:05:23 +00:00
parent 8a2308b411
commit 3f56ce206d
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/susimail/src/src/i2p/susi/webmail/WebMail.java
View File

@ -291,10 +291,34 @@ public class WebMail extends HttpServlet
return -1; return -1;
String as = a.formattedSubject; String as = a.formattedSubject;
String bs = b.formattedSubject; String bs = b.formattedSubject;
if (as.startsWith("Re:")) if (as.toLowerCase().startsWith("re:")) {
as = as.substring(3).trim(); as = as.substring(3).trim();
if (bs.startsWith("Re:")) } else if (as.toLowerCase().startsWith("fwd:")) {
as = as.substring(4).trim();
} else {
String xre = _("Re:").toLowerCase();
if (as.toLowerCase().startsWith(xre)) {
as = as.substring(xre.length()).trim();
} else {
String xfwd = _("Fwd:").toLowerCase();
if (as.toLowerCase().startsWith(xfwd))
as = as.substring(xfwd.length()).trim();
}
}
if (bs.toLowerCase().startsWith("re:")) {
bs = bs.substring(3).trim(); bs = bs.substring(3).trim();
} else if (bs.toLowerCase().startsWith("fwd:")) {
bs = bs.substring(4).trim();
} else {
String xre = _("Re:").toLowerCase();
if (bs.toLowerCase().startsWith(xre)) {
bs = bs.substring(xre.length()).trim();
} else {
String xfwd = _("Fwd:").toLowerCase();
if (bs.toLowerCase().startsWith(xfwd))
bs = bs.substring(xfwd.length()).trim();
}
}
int rv = collator.compare(as, bs); int rv = collator.compare(as, bs);
if (rv != 0) if (rv != 0)
return rv; return rv;
@ -961,7 +985,7 @@ public class WebMail extends HttpServlet
sessionObject.replyTo = mail.reply; sessionObject.replyTo = mail.reply;
else if( mail.sender != null && Mail.validateAddress( mail.sender ) ) else if( mail.sender != null && Mail.validateAddress( mail.sender ) )
sessionObject.replyTo = mail.sender; sessionObject.replyTo = mail.sender;
sessionObject.subject = "Re: " + mail.formattedSubject; sessionObject.subject = _("Re:") + ' ' + mail.formattedSubject;
StringWriter text = new StringWriter(); StringWriter text = new StringWriter();
PrintWriter pw = new PrintWriter( text ); PrintWriter pw = new PrintWriter( text );
pw.println( _("On {0} {1} wrote:", mail.formattedDate + " UTC", sessionObject.replyTo) ); pw.println( _("On {0} {1} wrote:", mail.formattedDate + " UTC", sessionObject.replyTo) );
@ -999,7 +1023,7 @@ public class WebMail extends HttpServlet
sessionObject.replyCC = buf.toString(); sessionObject.replyCC = buf.toString();
} }
if( forward ) { if( forward ) {
sessionObject.subject = "FWD: " + mail.formattedSubject; sessionObject.subject = _("Fwd:") + ' ' + mail.formattedSubject;
String sender = null; String sender = null;
if( mail.reply != null && Mail.validateAddress( mail.reply ) ) if( mail.reply != null && Mail.validateAddress( mail.reply ) )
sender = Mail.getAddress( mail.reply ); sender = Mail.getAddress( mail.reply );